Imported Upstream version 0.4.10upstream/0.4.10

33 files changed, 18613 insertions, 13959 deletions

diff --git a/po/ar.po b/po/ar.po
index ebc483f..8c3d46e 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1747,7 +1747,7 @@ msgid ""
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:69
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:70
diff --git a/po/be.po b/po/be.po
index 3e40e2f..5a19e3c 100644
--- a/po/be.po
+++ b/po/be.po
@@ -1734,7 +1734,7 @@ msgid ""
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:69
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:70
diff --git a/po/bg.po b/po/bg.po
index f34d0f8..12b5119 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1499,7 +1499,7 @@ msgid "Backup"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:36
diff --git a/po/ca.po b/po/ca.po
new file mode 100644
index 0000000..15885d2
--- /dev/null
+++ b/po/ca.po
@@ -0,0 +1,1974 @@
+# Catalan translation for rapid
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the rapid package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: rapid\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-25 01:13+0000\n"
+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
+"Language-Team: Catalan <ca@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: 2014-02-23 16:36+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
+
+#. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
+msgid "Rapid Photo Downloader"
+msgstr "Rapid Photo Downloader"
+
+#: rapid/rapid.py:122
+#, python-format
+msgid ""
+"%(date)s\n"
+"%(time)s"
+msgstr ""
+"%(date)s\n"
+"%(time)s"
+
+#: rapid/rapid.py:124
+#, python-format
+msgid "%(date)s %(time)s"
+msgstr "%(date)s %(time)s"
+
+#: rapid/rapid.py:127
+#, 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:162
+msgid "Device"
+msgstr "Dispositiu"
+
+#. Size refers to the total size of images on the device, typically in
+#. MB or GB
+#: rapid/rapid.py:180
+msgid "Size"
+msgstr "Mida"
+
+#: rapid/rapid.py:183
+msgid "Download Progress"
+msgstr "Progrés de la baixada"
+
+#: rapid/rapid.py:343
+#, python-format
+msgid "%(device)s did not unmount"
+msgstr "No es va desmuntar el %(device)s"
+
+#. This refers to when a device like a hard drive is having its contents scanned,
+#. looking for photos or videos. It is visible initially in the progress bar for each device
+#. (which normally holds "x photos and videos").
+#. It maybe displayed only briefly if the contents of the device being scanned is small.
+#: rapid/rapid.py:1241
+msgid "scanning..."
+msgstr "s’està escanejant…"
+
+#. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
+#: rapid/rapid.py:1818
+msgid "the root of the file system"
+msgstr "l’arrel del sistema de fitxers"
+
+#. message in dialog box which asks the user if they really want to be downloading from this location
+#: rapid/rapid.py:1822
+#, python-format
+msgid "Downloading from %(location)s."
+msgstr "Baixada des de %(location)s."
+
+#: rapid/rapid.py:1823
+msgid ""
+"Do you really want to download from here? On some systems, scanning this "
+"location can take a very long time."
+msgstr ""
+"Realment voleu baixar des d’aquí? En alguns sistemes, l’escaneig d’aquesta "
+"ubicació pot trigar massa."
+
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
+msgid "Download"
+msgstr "Baixa"
+
+#: rapid/rapid.py:2270
+msgid "Pause"
+msgstr "Atura"
+
+#: rapid/rapid.py:2376
+#, python-format
+msgid ""
+"These download folders are invalid:\n"
+"%(folder1)s\n"
+"%(folder2)s"
+msgstr ""
+"Aquestes carpetes de baixada no són vàlides:\n"
+"%(folder1)s\n"
+"%(folder2)s"
+
+#: rapid/rapid.py:2379
+#, python-format
+msgid ""
+"This download folder is invalid:\n"
+"%s"
+msgstr ""
+"Aquesta carpeta de baixada no és vàlida:\n"
+"%s"
+
+#: rapid/rapid.py:2380
+msgid "Download cannot proceed"
+msgstr "No es pot continuar amb la baixada"
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+"No hi ha cap dispositiu que contingui una carpeta vàlida per fer la còpia de "
+"seguretat de %(filetype)s"
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "fotos"
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "vídeos"
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr ""
+
+#: rapid/rapid.py:2802
+msgid "About 1 second remaining"
+msgstr "Queda prop d’un segon"
+
+#: rapid/rapid.py:2804
+#, python-format
+msgid "About %i seconds remaining"
+msgstr "Queden prop de %i segons"
+
+#: rapid/rapid.py:2806
+msgid "About 1 minute remaining"
+msgstr "Queda prop d’un minut"
+
+#. 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:2811
+#, python-format
+msgid "About %(minutes)i:%(seconds)02i minutes remaining"
+msgstr "Queden %(minutes)i:%(seconds)02i minuts"
+
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
+msgid "photos and videos"
+msgstr "fotos i vídeos"
+
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
+msgid "photos or videos"
+msgstr "fotos o vídeos"
+
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
+msgid "video"
+msgstr "vídeo"
+
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
+msgid "photo"
+msgstr "foto"
+
+#: rapid/rapid.py:2872
+#, python-format
+msgid "%(noFiles)s %(filetypes)s downloaded"
+msgstr "%(noFiles)s %(filetypes)s baixats"
+
+#: rapid/rapid.py:2876
+#, python-format
+msgid "%(noFiles)s %(filetypes)s failed to download"
+msgstr "No s’han pogut baixar %(noFiles)s %(filetypes)s"
+
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
+msgid "warnings"
+msgstr "avisos"
+
+#: rapid/rapid.py:2892
+msgid "All downloads complete"
+msgstr ""
+
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
+#, python-format
+msgid "%(number)s %(numberdownloaded)s"
+msgstr "%(number)s %(numberdownloaded)s"
+
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
+#, python-format
+msgid "%(filetype)s downloaded"
+msgstr "%(filetype)s baixats"
+
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
+#, python-format
+msgid "%(filetype)s failed to download"
+msgstr "No s’ha pogut baixar %(filetype)s"
+
+#. e.g.: 3 of 205 photos and videos (202 remaining)
+#: rapid/rapid.py:2970
+#, python-format
+msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
+msgstr "%(number)s de %(total)s %(filetypes)s (queden %(remaining)s)"
+
+#. e.g.: 205 of 205 photos and videos
+#: rapid/rapid.py:2977
+#, python-format
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr "%(number)s de %(total)s %(filetypes)s"
+
+#: rapid/rapid.py:3331
+msgid "From"
+msgstr "Des de"
+
+#: rapid/rapid.py:3339
+msgid "Auto Detect"
+msgstr "Detecció automàtica"
+
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
+#, python-format
+msgid "Select a folder containing %(file_types)s"
+msgstr "Trieu una carpeta que contingui %(file_types)s"
+
+#: rapid/rapid.py:3384
+msgid "Copy"
+msgstr "Còpia"
+
+#: rapid/rapid.py:3397
+msgid "Move"
+msgstr "Mou"
+
+#: rapid/rapid.py:3419
+msgid "To"
+msgstr "A"
+
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
+msgid "Photos:"
+msgstr "Fotos:"
+
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
+msgid "Select a folder to download photos to"
+msgstr "Trieu una carpeta en la qual es baixaran les fotos"
+
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
+msgid "Videos:"
+msgstr "Vídeos:"
+
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
+msgid "Select a folder to download videos to"
+msgstr "Trieu una carpeta en la qual es baixaran els vídeos"
+
+#: rapid/rapid.py:3650
+msgid "and"
+msgstr "i"
+
+#: rapid/rapid.py:3655
+msgid "Using backup devices"
+msgstr ""
+
+#: rapid/rapid.py:3657
+msgid "Using backup device"
+msgstr ""
+
+#: rapid/rapid.py:3659
+msgid "No backup devices detected"
+msgstr ""
+
+#: rapid/rapid.py:3686
+msgid "Free space:"
+msgstr "Espai lliure:"
+
+#. (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:3698
+#, 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:3702
+#, python-format
+msgid "%(free)s %(file_type)s"
+msgstr "%(free)s %(file_type)s"
+
+#. Inserted in the middle of the statusbar message concerning the amount of freespace
+#. Used to differentiate between two different file systems
+#. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
+#: rapid/rapid.py:3707
+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:3712
+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:3718
+#, python-format
+msgid "%(free)s free"
+msgstr "%(free)s lliure"
+
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3726
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
+msgstr ""
+
+#. user manually specified backup location
+#: rapid/rapid.py:3729
+#, python-format
+msgid "Backing up to %(path)s"
+msgstr ""
+
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3732
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr ""
+
+#: rapid/rapid.py:3739
+#, python-format
+msgid "%(freespace)s. %(backuppaths)s."
+msgstr "%(freespace)s. %(backuppaths)s."
+
+#: rapid/rapid.py:3768
+msgid "Program preferences are invalid"
+msgstr "Els paràmetres del programa no són vàlids"
+
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
+msgid "Photo"
+msgstr "Foto"
+
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
+msgid "Video"
+msgstr "Vídeo"
+
+#: rapid/rapid.py:3921
+#, python-format
+msgid "%(file_type)s download folder does not exist"
+msgstr "La carpeta de baixada per %(file_type)s no hi existeix"
+
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
+#, python-format
+msgid "Folder: %s"
+msgstr "Carpeta: %s"
+
+#: rapid/rapid.py:3935
+#, python-format
+msgid "%(file_type)s download folder is invalid"
+msgstr "La carpeta de baixada per %(file_type)s és incorrecta"
+
+#: rapid/rapid.py:3948
+#, python-format
+msgid "%(file_type)s download folder is not writable"
+msgstr "No es pot escriure a la carpeta de baixada per %(file_type)s"
+
+#: rapid/rapid.py:4034
+msgid "Thumbnails"
+msgstr "Miniatures"
+
+#. 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:4089
+#, python-format
+msgid ""
+"display program information on the command line as the program runs "
+"(default: %default)"
+msgstr ""
+
+#: rapid/rapid.py:4090
+msgid "display debugging information when run from the command line"
+msgstr "mostra informació de depuració en executar des de la línia d’ordres"
+
+#: rapid/rapid.py:4091
+msgid "only output errors to the command line"
+msgstr ""
+
+#. image file extensions are recognized RAW files plus TIFF and JPG
+#: rapid/rapid.py:4093
+msgid "list photo and video file extensions the program recognizes and exit"
+msgstr ""
+
+#: rapid/rapid.py:4095
+msgid ""
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
+msgstr ""
+
+#: rapid/rapid.py:4096
+msgid ""
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
+msgstr ""
+
+#: rapid/rapid.py:4097
+msgid "reset all program settings and preferences and exit"
+msgstr "restableix tots els paràmetres del programa i surt"
+
+#: rapid/rapid.py:4110
+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:4133
+#, python-format
+msgid "and %s"
+msgstr "i %s"
+
+#: rapid/rapid.py:4141
+msgid "All settings and preferences have been reset"
+msgstr "S’han restablit tots els paràmetres i preferències"
+
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
+msgid "Backing up error"
+msgstr "S’ha produït un error en fer la còpia de seguretat"
+
+#: rapid/backupfile.py:151
+#, python-format
+msgid "Destination directory could not be created: %(directory)s\n"
+msgstr "No s’ha pogut crear la carpeta de destinació: %(directory)s\n"
+
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"Origen: %(source)s\n"
+"Destinació: %(destination)s"
+
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
+#, python-format
+msgid "Error: %(inst)s"
+msgstr "S’ha produït un error: %(inst)s"
+
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
+#, python-format
+msgid ""
+"%(problem)s\n"
+"File: %(file)s"
+msgstr ""
+"%(problem)s\n"
+"Fitxer: %(file)s"
+
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr "S’ha produït un error desconegut"
+
+#: rapid/device.py:80
+msgid "Device Detected"
+msgstr ""
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/device.py:89
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
+msgstr "Voleu baixar fotos i vídeos des d’aquest dispositiu o partició?"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/device.py:108
+msgid "_Remember this choice"
+msgstr "_Recorda aquesta elecció"
+
+#: rapid/downloadtracker.py:299
+msgid "MB/s"
+msgstr "MB/s"
+
+#: rapid/generatenameconfig.py:151
+msgid "Date time"
+msgstr ""
+
+#: rapid/generatenameconfig.py:152
+msgid "Text"
+msgstr "Text"
+
+#: rapid/generatenameconfig.py:153
+msgid "Filename"
+msgstr "Nom del fitxer"
+
+#: rapid/generatenameconfig.py:154
+msgid "Metadata"
+msgstr "Metadades"
+
+#: rapid/generatenameconfig.py:155
+msgid "Sequences"
+msgstr "Seqüències"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/generatenameconfig.py:157 rapid/preferencesdialog.py:577
+msgid "Job code"
+msgstr "Codi de tasca"
+
+#: rapid/generatenameconfig.py:158
+msgid "Image date"
+msgstr "Data de la imatge"
+
+#: rapid/generatenameconfig.py:159
+msgid "Video date"
+msgstr "Data del vídeo"
+
+#: rapid/generatenameconfig.py:160
+msgid "Today"
+msgstr "Avui"
+
+#: rapid/generatenameconfig.py:161
+msgid "Yesterday"
+msgstr "Ahir"
+
+#. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
+#: rapid/generatenameconfig.py:163
+msgid "Download time"
+msgstr "Temps de baixada"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:165
+msgid "Name + extension"
+msgstr "Nom + extensió"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:167
+msgid "Name"
+msgstr "Nom"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:169
+msgid "Extension"
+msgstr "Extensió"
+
+#. 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 ""
+
+#: rapid/generatenameconfig.py:172
+msgid "Video number"
+msgstr ""
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:174
+msgid "Aperture"
+msgstr ""
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: 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:178
+msgid "Exposure time"
+msgstr "Temps d’exposició"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:180
+msgid "Focal length"
+msgstr "Distància focal"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:182
+msgid "Camera make"
+msgstr "Fabricant de la càmera"
+
+#. 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 "Model de la càmera"
+
+#. 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 ""
+
+#. 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 ""
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:190
+msgid "Serial number"
+msgstr "Número de sèrie"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:192
+msgid "Shutter count"
+msgstr ""
+
+#. File number currently refers to the Exif value Exif.Canon.FileNumber
+#: rapid/generatenameconfig.py:194
+msgid "File number"
+msgstr ""
+
+#. Only the folder component of the Exif.Canon.FileNumber value
+#: rapid/generatenameconfig.py:196
+msgid "Folder only"
+msgstr "Només la carpeta"
+
+#. The folder and file component of the Exif.Canon.FileNumber value
+#: rapid/generatenameconfig.py:198
+msgid "Folder and file"
+msgstr "Carpeta i fitxer"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:200
+msgid "Owner name"
+msgstr "Nom del propietari"
+
+#: rapid/generatenameconfig.py:201
+msgid "Codec"
+msgstr "Còdec"
+
+#: rapid/generatenameconfig.py:202
+msgid "Width"
+msgstr "Amplada"
+
+#: rapid/generatenameconfig.py:203
+msgid "Height"
+msgstr "Alçada"
+
+#: rapid/generatenameconfig.py:204
+msgid "Length"
+msgstr "Durada"
+
+#: rapid/generatenameconfig.py:205
+msgid "Frames Per Second"
+msgstr ""
+
+#: rapid/generatenameconfig.py:206
+msgid "Artist"
+msgstr "Artista"
+
+#: 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:209
+msgid "Downloads today"
+msgstr "Baixades avui"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: 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: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: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:217
+msgid "Sequence letter"
+msgstr "Lletra de seqüència"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:219
+msgid "All digits"
+msgstr "Tots els dígits"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:221
+msgid "Last digit"
+msgstr "Últim dígit"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:223
+msgid "Last 2 digits"
+msgstr "Últims 2 dígits"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:225
+msgid "Last 3 digits"
+msgstr "Últims 3 dígits"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:227
+msgid "Last 4 digits"
+msgstr "Últims 4 dígits"
+
+#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
+#: 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:231
+msgid "UPPERCASE"
+msgstr "MAJÚSCULES"
+
+#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
+#: rapid/generatenameconfig.py:233
+msgid "lowercase"
+msgstr "minúscules"
+
+#: rapid/generatenameconfig.py:234
+msgid "One digit"
+msgstr "Un dígit"
+
+#: rapid/generatenameconfig.py:235
+msgid "Two digits"
+msgstr "Dos dígits"
+
+#: rapid/generatenameconfig.py:236
+msgid "Three digits"
+msgstr "Tres dígits"
+
+#: rapid/generatenameconfig.py:237
+msgid "Four digits"
+msgstr "Quatre dígits"
+
+#: rapid/generatenameconfig.py:238
+msgid "Five digits"
+msgstr "Cinc dígits"
+
+#: rapid/generatenameconfig.py:239
+msgid "Six digits"
+msgstr "Sis dígits"
+
+#: rapid/generatenameconfig.py:240
+msgid "Seven digits"
+msgstr "Set dígits"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:242
+msgid "Subseconds"
+msgstr "Subsegons"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: 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: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:248
+msgid "YYMMDD"
+msgstr ""
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: 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:252
+msgid "MMDDYYYY"
+msgstr ""
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: 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:256
+msgid "MMDD"
+msgstr ""
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: 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:260
+msgid "DDMMYY"
+msgstr ""
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: 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:264
+msgid "YY"
+msgstr ""
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: 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: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: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 "Mes (abreujat)"
+
+#. 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: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: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: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: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:284
+msgid "MM (minutes)"
+msgstr "MM (minuts)"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:286
+msgid "SS"
+msgstr "SS"
+
+#: rapid/preferencesdialog.py:374
+#, python-format
+msgid "Subfolder preferences should not start with a %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:376
+#, python-format
+msgid "Subfolder preferences should not end with a %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:380
+#, python-format
+msgid "Subfolder preferences should not contain two %s one after the other"
+msgstr ""
+
+#: rapid/preferencesdialog.py:439 rapid/preferencesdialog.py:700
+msgid "Remove all Job Codes?"
+msgstr "Voleu suprimir tots els codis de tasques?"
+
+#: rapid/preferencesdialog.py:440 rapid/preferencesdialog.py:717
+msgid "Should all Job Codes be removed?"
+msgstr "Voleu suprimir tots els codis de tasques?"
+
+#: rapid/preferencesdialog.py:446
+msgid "Remove all Remembered Paths?"
+msgstr "Voleu suprimir tots els camins recordats?"
+
+#: rapid/preferencesdialog.py:447
+msgid "Should all remembered paths be removed?"
+msgstr "Voleu suprimir tots els camins recordats?"
+
+#: rapid/preferencesdialog.py:453
+msgid "Remove all Ignored Paths?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:454
+msgid "Should all ignored paths be removed?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:465
+msgid "Error in Photo Rename preferences"
+msgstr ""
+
+#: rapid/preferencesdialog.py:645
+msgid "Error in Video Rename preferences"
+msgstr ""
+
+#: rapid/preferencesdialog.py:666
+msgid "Error in Photo Download Subfolders preferences"
+msgstr ""
+
+#: 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:742
+msgid "Enter a Job Code"
+msgstr "Introduïu un codi de tasca"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:758
+msgid "Enter a new Job Code, or select a previous one"
+msgstr "Introduïu un codi de tasca nou o trieu un codi anterior"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:761
+msgid "Enter a new Job Code"
+msgstr "Introduïu un codi de tasca nou"
+
+#: rapid/preferencesdialog.py:766
+msgid "Job Code:"
+msgstr "Codi de tasca:"
+
+#: rapid/preferencesdialog.py:822
+msgid "Enter a Path to Ignore"
+msgstr ""
+
+#: rapid/preferencesdialog.py:834
+msgid "Specify a path that will never be scanned for photos or videos"
+msgstr ""
+
+#: rapid/preferencesdialog.py:839
+msgid "Path:"
+msgstr "Camí:"
+
+#: rapid/preferencesdialog.py:1092
+msgid "Job Code"
+msgstr "Codi de tasca"
+
+#: rapid/preferencesdialog.py:1363
+msgid "Select a folder in which to backup photos"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1376
+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:1473
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1524
+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:1527
+#, python-format
+msgid "<i>Example: %s</i>"
+msgstr "<i>Exemple: %s</i>"
+
+#. Preferences list is now empty
+#: rapid/preferencesdialog.py:1617
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
+"They will be reset to their default values."
+msgstr ""
+
+#: rapid/preferencesdialog.py:1762
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1764
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1765
+msgid "Invalid regular expression"
+msgstr "L’expressió regular no és vàlida"
+
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1949
+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:1951
+msgid "externaldrive2"
+msgstr ""
+
+#: rapid/prefsrapid.py:127
+msgid "New York"
+msgstr "Nova York"
+
+#: rapid/prefsrapid.py:128
+msgid "Manila"
+msgstr "Manila"
+
+#: rapid/prefsrapid.py:128
+msgid "Prague"
+msgstr "Praga"
+
+#: rapid/prefsrapid.py:128
+msgid "Helsinki"
+msgstr "Hèlsinki"
+
+#: rapid/prefsrapid.py:128
+msgid "Wellington"
+msgstr "Wellington"
+
+#: rapid/prefsrapid.py:129
+msgid "Tehran"
+msgstr "Teheran"
+
+#: rapid/prefsrapid.py:129
+msgid "Kampala"
+msgstr "Kampala"
+
+#: rapid/prefsrapid.py:129
+msgid "Paris"
+msgstr "París"
+
+#: rapid/prefsrapid.py:129
+msgid "Berlin"
+msgstr "Berlín"
+
+#: rapid/prefsrapid.py:129
+msgid "Sydney"
+msgstr "Sydney"
+
+#: rapid/prefsrapid.py:130
+msgid "Budapest"
+msgstr "Budapest"
+
+#: rapid/prefsrapid.py:130
+msgid "Rome"
+msgstr "Roma"
+
+#: rapid/prefsrapid.py:130
+msgid "Moscow"
+msgstr "Moscou"
+
+#: rapid/prefsrapid.py:130
+msgid "Delhi"
+msgstr "Delhi"
+
+#: rapid/prefsrapid.py:130
+msgid "Warsaw"
+msgstr "Varsòvia"
+
+#: rapid/prefsrapid.py:131
+msgid "Jakarta"
+msgstr "Jakarta"
+
+#: rapid/prefsrapid.py:131
+msgid "Madrid"
+msgstr "Madrid"
+
+#: rapid/prefsrapid.py:131
+msgid "Stockholm"
+msgstr "Estocolm"
+
+#. components
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
+msgid "subfolder"
+msgstr "subcarpeta"
+
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
+msgid "filename"
+msgstr "nom de fitxer"
+
+#: rapid/problemnotification.py:85
+#, python-format
+msgid "Date time value %s appears invalid."
+msgstr ""
+
+#: rapid/problemnotification.py:86
+msgid "Filename does not have an extension."
+msgstr ""
+
+#. a number component is something like the 8346 in IMG_8346.JPG
+#: rapid/problemnotification.py:88
+msgid "Filename does not have a number component."
+msgstr ""
+
+#: rapid/problemnotification.py:89
+#, python-format
+msgid "Error generating component %s."
+msgstr ""
+
+#. a generic problem
+#: rapid/problemnotification.py:91
+#, python-format
+msgid "%(filetype)s metadata cannot be read"
+msgstr ""
+
+#: rapid/problemnotification.py:93
+#, python-format
+msgid "%(filetype)s %(area)s could not be generated"
+msgstr ""
+
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
+#, python-format
+msgid "An error occurred when copying the %(filetype)s"
+msgstr ""
+
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr ""
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
+#, python-format
+msgid "%(filetype)s already exists"
+msgstr ""
+
+#: rapid/problemnotification.py:105
+#, python-format
+msgid ""
+"%(filetype)s could not be backed up because no suitable backup locations "
+"were found."
+msgstr ""
+
+#: rapid/problemnotification.py:110
+#, 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:111
+#, python-format
+msgid "%(filetype)s was already downloaded"
+msgstr ""
+
+#: rapid/problemnotification.py:115
+#, 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:116
+#, python-format
+msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
+msgstr ""
+
+#: rapid/problemnotification.py:117
+#, python-format
+msgid "There is no data with which to name the %(filetype)s."
+msgstr ""
+
+#: rapid/problemnotification.py:119
+#, python-format
+msgid "Error: %(errorno)s %(strerror)s"
+msgstr ""
+
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+
+#: rapid/problemnotification.py:213
+msgid "The metadata might be corrupt."
+msgstr ""
+
+#: rapid/problemnotification.py:216
+msgid ""
+"The filename, extension and Exif information indicate it has already been "
+"downloaded."
+msgstr ""
+
+#: rapid/problemnotification.py:235
+#, python-format
+msgid " It was backed up to %(volume)s"
+msgstr ""
+
+#: rapid/problemnotification.py:237
+msgid " It was backed up to these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
+#, python-format
+msgid "%s, "
+msgstr "%s, "
+
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
+#, python-format
+msgid "%(volumes)s and %(final_volume)s."
+msgstr "%(volumes)s i %(final_volume)s."
+
+#: rapid/problemnotification.py:252
+#, python-format
+msgid ""
+"Photos detected with the same filenames, but taken at different times: "
+"%(details)s"
+msgstr ""
+
+#: rapid/problemnotification.py:269
+#, python-format
+msgid "An error occurred when backing up on %(volume)s: %(inst)s."
+msgstr ""
+
+#: rapid/problemnotification.py:271
+#, python-format
+msgid "An error occurred when backing up on %(volume)s."
+msgstr "S’ha produït un error en fer la còpia de seguretat a %(volume)s."
+
+#: rapid/problemnotification.py:273
+msgid "Errors occurred when backing up on the following backup devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
+#, python-format
+msgid "%(volume)s (%(inst)s), "
+msgstr "%(volume)s (%(inst)s), "
+
+#: rapid/problemnotification.py:279
+#, python-format
+msgid "%(volume)s, "
+msgstr "%(volume)s, "
+
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
+#, python-format
+msgid "%(volumes)s and %(volume)s (%(inst)s)."
+msgstr "%(volumes)s i %(volume)s (%(inst)s)."
+
+#: rapid/problemnotification.py:288
+#, python-format
+msgid "%(volumes)s and %(volume)s."
+msgstr "%(volumes)s i %(volume)s."
+
+#: rapid/problemnotification.py:296
+#, python-format
+msgid "Backup already exists on %(volume)s."
+msgstr ""
+
+#: rapid/problemnotification.py:298
+msgid "Backups already exist in these locations: "
+msgstr ""
+
+#: rapid/problemnotification.py:308
+#, python-format
+msgid "Backup overwritten on %(volume)s."
+msgstr ""
+
+#: rapid/problemnotification.py:310
+msgid "Backups overwritten on these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:321
+#, python-format
+msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
+msgstr ""
+
+#: rapid/problemnotification.py:323
+msgid ""
+"Errors occurred when creating directories on the following backup devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:347
+#, python-format
+msgid "%(previousproblem)s Additionally, %(newproblem)s"
+msgstr ""
+
+#: rapid/problemnotification.py:355
+#, python-format
+msgid " Furthermore, there were %(problems)s."
+msgstr ""
+
+#: rapid/problemnotification.py:357
+#, python-format
+msgid " Furthermore, there was a %(problem)s."
+msgstr ""
+
+#: rapid/problemnotification.py:366
+#, python-format
+msgid "The %(type)s metadata is missing."
+msgstr "Falten les metadades de tipus %(type)s."
+
+#: rapid/problemnotification.py:368
+msgid "The following metadata is missing: "
+msgstr "Falten les metadades següents: "
+
+#: rapid/problemnotification.py:371
+#, python-format
+msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+msgstr ""
+
+#: rapid/problemnotification.py:388
+msgid "Problems in subfolder and filename generation"
+msgstr ""
+
+#: rapid/problemnotification.py:390
+msgid "Problem in subfolder and filename generation"
+msgstr ""
+
+#: rapid/problemnotification.py:393
+#, python-format
+msgid "Problems in %s generation"
+msgstr ""
+
+#: rapid/problemnotification.py:395
+#, python-format
+msgid "Problem in %s generation"
+msgstr ""
+
+#: rapid/problemnotification.py:404
+#, python-format
+msgid "%(filetype)s already exists, but it was backed up"
+msgstr ""
+
+#: rapid/problemnotification.py:406
+#, python-format
+msgid "An error occurred when copying the %(filetype)s, but it was backed up"
+msgstr ""
+
+#: rapid/problemnotification.py:428
+msgid "Multiple problems were encountered"
+msgstr ""
+
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
+msgid "Photos detected with the same filenames, but taken at different times"
+msgstr ""
+
+#: rapid/problemnotification.py:436
+msgid "there were errors backing up"
+msgstr ""
+
+#: rapid/problemnotification.py:437
+msgid "There were errors backing up"
+msgstr ""
+
+#: rapid/problemnotification.py:439
+msgid "there was an error backing up"
+msgstr ""
+
+#: rapid/problemnotification.py:440
+msgid "There was an error backing up"
+msgstr ""
+
+#. e.g.
+#: rapid/problemnotification.py:443
+#, python-format
+msgid "%(previousproblem)s, and %(backinguperror)s"
+msgstr "%(previousproblem)s i %(backinguperror)s"
+
+#: rapid/rpdfile.py:159
+#, python-format
+msgid "%(number)s %(filetypes)s"
+msgstr "%(number)s %(filetypes)s"
+
+#: rapid/rpdfile.py:169
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
+msgstr ""
+
+#: rapid/subfolderfile.py:81
+#, python-format
+msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr "Subcarpeta i nom del fitxer"
+
+#: rapid/subfolderfile.py:406
+msgid "Photo has already been downloaded"
+msgstr "Ja s’havia baixat la foto"
+
+#: rapid/subfolderfile.py:407
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Origen: %(source)s"
+
+#: rapid/subfolderfile.py:485
+msgid "Failed to create download subfolder"
+msgstr ""
+
+#: rapid/subfolderfile.py:486
+#, python-format
+msgid "Path: %s"
+msgstr "Camí: %s"
+
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr "Quant a…"
+
+#: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:16
+msgid "_File"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:17
+msgid "Download / Pause"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:18
+msgid "_Select"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:19
+msgid "Select All Without _Job Code"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:20
+msgid "Select All Wit_h Job Code"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:21
+msgid "_View"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:22
+msgid "_Error Log"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:23
+msgid "_Clear Completed Downloads"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:24
+msgid "Previous File"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:25
+msgid "Next File"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:26
+msgid "_Help"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:27
+msgid "_Translate this Application..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:28
+msgid "_Include in download"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:29
+msgid "_Download"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:1
+msgid "Preferences: Rapid Photo Downloader"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:2
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:3
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:4
+msgid "<b>Download Subfolders</b>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:5
+msgid "Download folder:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:6
+msgid ""
+"Choose the download folder. Subfolders for the downloaded photos will be "
+"automatically created in this folder using the structure specified below."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:7
+msgid "<b>Download Folder</b>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:8
+msgid "Photo Folders"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:9
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:10
+msgid "<b>Photo Rename</b>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:11
+msgid " "
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:12
+msgid "<i>New:</i>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:13
+msgid "<i>Original:</i>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:14
+msgid "<b>Example</b>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:15
+msgid "Photo Rename"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:16
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:17
+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 ""
+
+#: rapid/glade3/prefs.ui.h:18
+msgid ""
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:19
+msgid "Video Folders"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:20
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:21
+msgid "Video Rename"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:22
+msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:23
+msgid "<b>Sequence Numbers</b>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:24
+msgid ""
+"Specify the time in 24 hour format at which the <i>Downloads today</i> "
+"sequence number should be reset."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:25
+msgid "Day start:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:26
+msgid "Downloads today:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:27
+msgid "Stored number:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:28
+msgid ":"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:29
+msgid " hh:mm"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:30
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:31
+msgid "<b>Compatibility with Other Operating Systems</b>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:32
+msgid ""
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:33
+msgid "Strip incompatible characters"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:34
+msgid "Rename Options"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:35
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:36
+msgid "<b>Job Codes</b>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:37
+msgid "_Add..."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:39
+msgid "R_emove All"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:40
+msgid "Job Codes"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:41
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:42
+msgid "Devices"
+msgstr ""
+
+#: 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"
+"\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\n"
+"\n"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:48
+msgid "Automatically detect Portable Storage Devices"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:49
+msgid "Automatically detect devices"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:50
+msgid ""
+"If you enable automatic detection of Portable Storage Devices, the entire "
+"device will be scanned. On large devices, this could take some time.\n"
+"\n"
+"When this option is enabled, and a potential device is detected, you will be "
+"prompted to determine if it should be scanned or not."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:53
+msgid "Location:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:54
+msgid ""
+"If you disable automatic detection, choose the exact location of the photos "
+"and videos."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:55
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:56
+msgid "Remembered Paths"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:57
+msgid ""
+"Remembered paths are those associated with devices that you have chosen to "
+"always scan or ignore when automatic detection of Portable Storage Devices "
+"is enabled."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:59
+msgid ""
+"Specify the ending portion of any paths you want ignored when scanning "
+"devices for photos or videos. Any path ending with the values below will not "
+"be scanned."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:61
+msgid "Re_move All"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:62
+msgid "Use _python-style regular expressions"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:63
+msgid "Device Options"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:64
+msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:65
+msgid "<b>Backup</b>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:66
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:67
+msgid "Automatically detect backup devices"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:68
+msgid ""
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:69
+msgid "Back up photos and videos when downloading"
+msgstr ""
+
+#: 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 ""
+
+#: rapid/glade3/prefs.ui.h:73
+msgid "Photo backup location:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:74
+msgid "Photo backup folder name:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:75
+msgid "<i>Example:</i>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:76
+msgid "<i>/media/externaldrive/Photos</i>"
+msgstr "<i>/suports/unitatexterna/Fotos</i>"
+
+#: rapid/glade3/prefs.ui.h:77
+msgid "Video backup folder name:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:78
+msgid "Video backup location:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:79
+msgid "Back up"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:80
+msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Miscel·lània</span>"
+
+#: rapid/glade3/prefs.ui.h:81
+msgid "<b>Program Automation</b>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:82
+msgid "Unmount (\"eject\") device upon download completion"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:83
+msgid "Start downloading at program startup"
+msgstr "Comença la baixada en engegar el programa"
+
+#: rapid/glade3/prefs.ui.h:84
+msgid "Start downloading upon device insertion"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:85
+msgid "Exit program when download completes"
+msgstr "Tanca el programa quan finalitzi la baixada"
+
+#: rapid/glade3/prefs.ui.h:86
+msgid "Exit program even if download had warnings or errors"
+msgstr "Tanca el programa fins i tot quan hi hagi errors o avisos"
+
+#: rapid/glade3/prefs.ui.h:87
+msgid "Automatically rotate JPEG images"
+msgstr "Gira automàticament les imatges JPEG"
+
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr "Verifica els fitxers a mesura que es baixen"
+
+#: rapid/glade3/prefs.ui.h:90
+msgid "Performance"
+msgstr "Rendiment"
+
+#: rapid/glade3/prefs.ui.h:91
+msgid "Generate thumbnails (slower)"
+msgstr "Genera miniatures (més lent)"
+
+#: rapid/glade3/prefs.ui.h:92
+msgid "Miscellaneous"
+msgstr "Miscel·lània"
+
+#: rapid/glade3/prefs.ui.h:93
+msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Gestió d’errors</span>"
+
+#: rapid/glade3/prefs.ui.h:94
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr "<b>Conflictes de nom de foto i vídeo</b>"
+
+#: rapid/glade3/prefs.ui.h:95
+msgid "Add unique identifier"
+msgstr "Afegeix un identificador únic"
+
+#: rapid/glade3/prefs.ui.h:96
+msgid "Skip download"
+msgstr "Ignora la baixada"
+
+#: rapid/glade3/prefs.ui.h:97
+msgid ""
+"When a photo or video of the same name has already been downloaded, choose "
+"whether to skip downloading the file, or to add a unique indentifier."
+msgstr ""
+"Quan ja s’ha baixat una foto o vídeo amb el mateix nom, trieu entre ometre "
+"el fitxer o afegir un identificador únic."
+
+#: rapid/glade3/prefs.ui.h:98
+msgid ""
+"When backing up, choose whether to overwrite a file on the backup device "
+"that has the same name, or skip backing it up."
+msgstr ""
+"En fer còpies de seguretat, trieu entre sobreescriure un fitxer en el "
+"dispositiu amb el mateix nom o ometre-ho."
+
+#: rapid/glade3/prefs.ui.h:99
+msgid "Overwrite"
+msgstr "Sobreescriu"
+
+#: rapid/glade3/prefs.ui.h:100
+msgid "Skip"
+msgstr "Omet"
+
+#: rapid/glade3/prefs.ui.h:101
+msgid "Error Handling"
+msgstr "Gestió d’errors"
+
+#: rapid/glade3/about.ui.h:1
+msgid "Import your photos and videos efficiently and reliably"
+msgstr "Importeu les vostres fotos i vídeos amb eficiència i fiabilitat"
diff --git a/po/cs.po b/po/cs.po
index efefdb5..b0fd1de 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-06-23 04:00-0500\n"
-"PO-Revision-Date: 2012-08-16 13:42+0000\n"
-"Last-Translator: Radek Stastny <Unknown>\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:14+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 00:24+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:119
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:122
+#: rapid/rapid.py:127
 #, 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:157
+#: rapid/rapid.py:162
 msgid "Device"
 msgstr "Zařízení"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:175
+#: rapid/rapid.py:180
 msgid "Size"
 msgstr "Velikost"
 
-#: rapid/rapid.py:178
+#: rapid/rapid.py:183
 msgid "Download Progress"
 msgstr "Průběh stahování"
 
-#: rapid/rapid.py:336
+#: rapid/rapid.py:343
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s se neodpojilo"
@@ -66,36 +66,36 @@ msgstr "%(device)s se neodpojilo"
 #. 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:1216
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr "skenování..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1782
+#: rapid/rapid.py:1818
 msgid "the root of the file system"
 msgstr "kořen souborového systému"
 
 #. message in dialog box which asks the user if they really want to be downloading from this location
-#: rapid/rapid.py:1786
+#: rapid/rapid.py:1822
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Stahování z %(location)s."
 
-#: rapid/rapid.py:1787
+#: rapid/rapid.py:1823
 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:2209
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr "Stáhnout"
 
-#: rapid/rapid.py:2212
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr "Pozastavit"
 
-#: rapid/rapid.py:2317
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -106,7 +106,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2320
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -115,176 +115,187 @@ msgstr ""
 "Následující složka je neplatná:\n"
 "%s"
 
-#: rapid/rapid.py:2321
+#: rapid/rapid.py:2380
 msgid "Download cannot proceed"
 msgstr "Stahování nemůže pokračovat"
 
-#: rapid/rapid.py:2700
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "fotografie"
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "videa"
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr ""
+
+#: rapid/rapid.py:2802
 msgid "About 1 second remaining"
 msgstr "Zbývá 1 sekunda"
 
-#: rapid/rapid.py:2702
+#: rapid/rapid.py:2804
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Zbývá %i sekund"
 
-#: rapid/rapid.py:2704
+#: rapid/rapid.py:2806
 msgid "About 1 minute remaining"
 msgstr "Zbývá 1 minuta"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:2709
+#: rapid/rapid.py:2811
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Zbývá %(minutes)i:%(seconds)02i minut"
 
-#: rapid/rapid.py:2731 rapid/rpdfile.py:123
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
 msgid "photos and videos"
 msgstr "fotografie a videa"
 
-#: rapid/rapid.py:2733 rapid/rpdfile.py:125
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
 msgid "photos or videos"
 msgstr "fotografie či videa"
 
-#: rapid/rapid.py:2736 rapid/rapid.py:3558 rapid/rpdfile.py:128
-msgid "videos"
-msgstr "videa"
-
-#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
-#: rapid/rpdfile.py:291
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
 msgid "video"
 msgstr "video"
 
-#: rapid/rapid.py:2741 rapid/rapid.py:3556 rapid/rpdfile.py:133
-msgid "photos"
-msgstr "fotografie"
-
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2743 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
-#: rapid/rpdfile.py:272
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
 msgid "photo"
 msgstr "fotografie"
 
-#: rapid/rapid.py:2770
+#: rapid/rapid.py:2872
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s staženo"
 
-#: rapid/rapid.py:2774
+#: rapid/rapid.py:2876
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s nebyly staženy"
 
-#: rapid/rapid.py:2777 rapid/rapid.py:2829
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
 msgid "warnings"
 msgstr "varování"
 
-#: rapid/rapid.py:2786
+#: rapid/rapid.py:2892
 msgid "All downloads complete"
 msgstr "Všechna stahování kompletní"
 
-#: rapid/rapid.py:2792 rapid/rapid.py:2801 rapid/rapid.py:2810
-#: rapid/rapid.py:2819 rapid/rapid.py:2827
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2794 rapid/rapid.py:2812
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s staženo"
 
-#: rapid/rapid.py:2803 rapid/rapid.py:2821
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s nelze stáhnout"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2860
+#: rapid/rapid.py:2970
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr "%(number)s z %(total)s %(filetypes)s (%(remaining)s remaining)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:2977
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s z celkem %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3222
+#: rapid/rapid.py:3331
 msgid "From"
 msgstr "Z"
 
-#: rapid/rapid.py:3230
+#: rapid/rapid.py:3339
 msgid "Auto Detect"
 msgstr "Automatická detekce"
 
-#: rapid/rapid.py:3234 rapid/preferencesdialog.py:1327
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Vyberte složku, která obsahuje %(file_types)s"
 
-#: rapid/rapid.py:3275
+#: rapid/rapid.py:3384
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: rapid/rapid.py:3288
+#: rapid/rapid.py:3397
 msgid "Move"
 msgstr "Přesun"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3419
 msgid "To"
 msgstr "Do"
 
-#: rapid/rapid.py:3317 rapid/rapid.py:3986
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
 msgid "Photos:"
 msgstr "Fotografie:"
 
-#: rapid/rapid.py:3320 rapid/preferencesdialog.py:1164
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
 msgid "Select a folder to download photos to"
 msgstr "Vyberte složku do které mají být obrázky staženy"
 
-#: rapid/rapid.py:3332 rapid/rapid.py:3986
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
 msgid "Videos:"
 msgstr "Videa:"
 
-#: rapid/rapid.py:3334 rapid/preferencesdialog.py:1182
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
 msgid "Select a folder to download videos to"
 msgstr "Zvolte adresář do kterého se bude stahovat video"
 
-#: rapid/rapid.py:3526
+#: rapid/rapid.py:3650
 msgid "and"
 msgstr "a"
 
-#: rapid/rapid.py:3531
+#: rapid/rapid.py:3655
 msgid "Using backup devices"
 msgstr "Používání zálohovacích zařízení"
 
-#: rapid/rapid.py:3533
+#: rapid/rapid.py:3657
 msgid "Using backup device"
 msgstr "Používání zálohovacího zařízení"
 
-#: rapid/rapid.py:3535
+#: rapid/rapid.py:3659
 msgid "No backup devices detected"
 msgstr "Zálohovací zařízení nebylo detekováno"
 
-#: rapid/rapid.py:3562
+#: rapid/rapid.py:3686
 msgid "Free space:"
 msgstr "Volné místo:"
 
 #. (videos) or (photos) will be appended to the free space message displayed to the
 #. user in the status bar.
 #. you should only translate this if your language does not use parantheses
-#: rapid/rapid.py:3574
+#: rapid/rapid.py:3698
 #, 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:3578
+#: rapid/rapid.py:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -292,147 +303,148 @@ 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:3583
+#: rapid/rapid.py:3707
 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:3588
+#: rapid/rapid.py:3712
 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:3594
+#: rapid/rapid.py:3718
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s volné"
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3602
+#: rapid/rapid.py:3726
 #, python-format
 msgid "Backing up photos and videos to %(path)s"
 msgstr "Zálohování fotografií a videí do %(path)s"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3605
+#: rapid/rapid.py:3729
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Zálohování %(path)s"
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3608
+#: rapid/rapid.py:3732
 #, python-format
 msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr "Zálohování fotografií do %(path)s a videí do %(path2)s"
 
-#: rapid/rapid.py:3615
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3644
+#: rapid/rapid.py:3768
 msgid "Program preferences are invalid"
 msgstr "Nastavení programu je nevalidní"
 
-#: rapid/rapid.py:3770 rapid/rpdfile.py:273
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
 msgid "Photo"
 msgstr "Fotografie"
 
-#: rapid/rapid.py:3772 rapid/rpdfile.py:292
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:3781
+#: rapid/rapid.py:3921
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s složka neexistuje"
 
-#: rapid/rapid.py:3783 rapid/rapid.py:3797 rapid/rapid.py:3810
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
 msgid "Folder: %s"
 msgstr "Složka: %s"
 
-#: rapid/rapid.py:3795
+#: rapid/rapid.py:3935
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s složka je neplatná"
 
-#: rapid/rapid.py:3808
+#: rapid/rapid.py:3948
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s do složky nelze zapisovat"
 
-#: rapid/rapid.py:3894
+#: rapid/rapid.py:4034
 msgid "Thumbnails"
 msgstr "Náhledy"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3949
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
 "(default: %default)"
 msgstr "zobrazit informace o programu na příkazové řádce (default: %default)"
 
-#: rapid/rapid.py:3950
+#: rapid/rapid.py:4090
 msgid "display debugging information when run from the command line"
 msgstr "Zobrazit ladicí informace při spuštění z příkazové řádky"
 
-#: rapid/rapid.py:3951
+#: rapid/rapid.py:4091
 msgid "only output errors to the command line"
 msgstr "pouze výstup chyb do příkazové řádky"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3953
+#: rapid/rapid.py:4093
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr "zobrazit přípony souborů, které program rozpozná, a skončit"
 
-#: rapid/rapid.py:3955
+#: rapid/rapid.py:4095
 msgid ""
 "automatically detect devices from which to download, overwriting existing "
 "program preferences"
 msgstr ""
 
-#: rapid/rapid.py:3956
+#: rapid/rapid.py:4096
 msgid ""
 "manually specify the PATH of the device from which to download, overwriting "
 "existing program preferences"
 msgstr ""
 
-#: rapid/rapid.py:3957
+#: rapid/rapid.py:4097
 msgid "reset all program settings and preferences and exit"
 msgstr "resetovat nastavení programu a skončit"
 
-#: rapid/rapid.py:3970
+#: rapid/rapid.py:4110
 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
+#: rapid/rapid.py:4133
 #, python-format
 msgid "and %s"
 msgstr "a %s"
 
-#: rapid/rapid.py:3999
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
 msgstr "Všechna nastavení a předvolby byly nastaveny na výchozí hodnoty"
 
-#: rapid/backupfile.py:157 rapid/backupfile.py:180
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
 msgid "Backing up error"
 msgstr "Chyba zálohování"
 
-#: rapid/backupfile.py:159
+#: rapid/backupfile.py:151
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Adresář destinace nelze vytvořit: %(directory)s\n"
 
-#: rapid/backupfile.py:161 rapid/backupfile.py:182 rapid/subfolderfile.py:199
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -441,13 +453,29 @@ msgstr ""
 "Zdroj: %(source)s\n"
 "Destinace: %(destination)s"
 
-#: rapid/backupfile.py:164 rapid/backupfile.py:184
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Chyba: %(inst)s"
 
-#: rapid/copyfiles.py:163 rapid/subfolderfile.py:214
-#: rapid/subfolderfile.py:347 rapid/subfolderfile.py:365
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -456,6 +484,10 @@ msgstr ""
 "%(problem)s\n"
 "Soubor: %(file)s"
 
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr ""
+
 #: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Zařízení detekováno"
@@ -937,20 +969,20 @@ msgstr ""
 msgid "Path:"
 msgstr "Cesta:"
 
-#: rapid/preferencesdialog.py:1082
+#: rapid/preferencesdialog.py:1092
 msgid "Job Code"
 msgstr "Pracovní kód"
 
-#: rapid/preferencesdialog.py:1353
+#: rapid/preferencesdialog.py:1363
 msgid "Select a folder in which to backup photos"
 msgstr "Zvolte složku, ve které bude uložena záloha fotografií"
 
-#: rapid/preferencesdialog.py:1366
+#: rapid/preferencesdialog.py:1376
 msgid "Select a folder in which to backup videos"
 msgstr "Zvolte složku ve které budou zálohována videa"
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/preferencesdialog.py:1461
+#: rapid/preferencesdialog.py:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -959,7 +991,7 @@ msgstr ""
 "možné vytvořit celé jméno. Použijte prosím pro vytvoření jména  jiné "
 "možnosti.</i>"
 
-#: rapid/preferencesdialog.py:1512
+#: rapid/preferencesdialog.py:1524
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -969,13 +1001,13 @@ msgstr ""
 "možnosti.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/preferencesdialog.py:1515
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Příklad: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1605
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -986,7 +1018,7 @@ msgstr ""
 "použít.\n"
 "Použijí se výchozí hodnoty."
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1762
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -994,7 +1026,7 @@ msgid ""
 " %s"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1752
+#: rapid/preferencesdialog.py:1764
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -1002,17 +1034,17 @@ msgid ""
 " %s"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1753
+#: rapid/preferencesdialog.py:1765
 msgid "Invalid regular expression"
 msgstr "Neplatný regulární výraz"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1934
+#: rapid/preferencesdialog.py:1949
 msgid "externaldrive1"
 msgstr "externídisk1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1936
+#: rapid/preferencesdialog.py:1951
 msgid "externaldrive2"
 msgstr "externídisk2"
 
@@ -1089,55 +1121,60 @@ msgid "Stockholm"
 msgstr "Stockholm"
 
 #. components
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:358
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
 msgstr "podsložka"
 
-#: rapid/problemnotification.py:28 rapid/subfolderfile.py:356
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr "název souboru"
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr "Hodnota pro datum nebo čas %s je neplatná."
 
-#: rapid/problemnotification.py:82
+#: rapid/problemnotification.py:86
 msgid "Filename does not have an extension."
 msgstr "Jméno souboru neobsahuje příponu."
 
 #. a number component is something like the 8346 in IMG_8346.JPG
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:88
 msgid "Filename does not have a number component."
 msgstr "Jméno souboru neobsahuje číselnou hodnotu."
 
-#: rapid/problemnotification.py:85
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr "Chyba při vytváření části %s."
 
 #. a generic problem
-#: rapid/problemnotification.py:87
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr "Metadata %(filetype)s nelze načíst."
 
-#: rapid/problemnotification.py:89
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "Nelze vytvořit %(filetype)s %(area)s"
 
-#: rapid/problemnotification.py:91 rapid/problemnotification.py:92
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr "Při kopírování %(filetype)s došlo k chybě."
 
-#: rapid/problemnotification.py:94 rapid/problemnotification.py:95
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr ""
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "%(filetype)s a již existuje"
 
-#: rapid/problemnotification.py:98
+#: rapid/problemnotification.py:105
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1145,19 +1182,19 @@ msgid ""
 msgstr ""
 "%(filetype)s nelze zálohovat, protože nebylo nalezeno vhodné umístění."
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:110
 #, 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:104
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "%(filetype)s byl už stažen"
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:115
 #, python-format
 msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
@@ -1166,53 +1203,59 @@ msgstr ""
 "Existující %(filetype)s byl naposledy změněn  %(date)s v %(time)s. Byl "
 "přidán jedinečný identifikátor  '%(identifier)s'."
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:116
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr "Existující %(filetype)s byl naposledy změněn  %(date)s v %(time)s."
 
-#: rapid/problemnotification.py:110
+#: rapid/problemnotification.py:117
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr "Neexistují žádná data k pojmenování %(filetype)s."
 
-#: rapid/problemnotification.py:112
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Chyba: %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:202
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr "Metadata jsou pravděpodobně poškozená."
 
-#: rapid/problemnotification.py:205
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
 msgstr "Jméno souboru, přípona a EXIF naznačují, že soubor byl již stažen."
 
-#: rapid/problemnotification.py:224
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " byl zálohován na %(volume)s"
 
-#: rapid/problemnotification.py:226
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr " byl zálohován na následující zařízení: "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:229 rapid/problemnotification.py:290
-#: rapid/problemnotification.py:302
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s a %(final_volume)s."
 
-#: rapid/problemnotification.py:241
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
@@ -1221,257 +1264,308 @@ msgstr ""
 "Byly nalezeny fotky se stejným jménem, ale rozdílným časem vzniku: "
 "%(details)s"
 
-#: rapid/problemnotification.py:258
+#: rapid/problemnotification.py:269
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr "Došlo k chybě při zálohování na %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:260
+#: rapid/problemnotification.py:271
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr "Došlo k chybě při zálohování na %(volume)s."
 
-#: rapid/problemnotification.py:262
+#: rapid/problemnotification.py:273
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr "Došlo k chybám při zálohování na následující zařízení: "
 
-#: rapid/problemnotification.py:266 rapid/problemnotification.py:314
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:268
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:272 rapid/problemnotification.py:316
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr "%(volumes)s a %(volume)s (%(inst)s)."
 
-#: rapid/problemnotification.py:277
+#: rapid/problemnotification.py:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s a %(volume)s."
 
-#: rapid/problemnotification.py:285
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "Na zařízení %(volume)s už záloha existuje."
 
-#: rapid/problemnotification.py:287
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr "Zálohy už existují, a to v těchto umístěních: "
 
-#: rapid/problemnotification.py:297
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "Záloha na %(volume)s byla přepsána."
 
-#: rapid/problemnotification.py:299
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr "Zálohy na následujících zařízeních byly přepsány: "
 
-#: rapid/problemnotification.py:310
+#: rapid/problemnotification.py:321
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr "Došlo k chybě při vytváření adresářů na %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:312
+#: rapid/problemnotification.py:323
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr "Došlo k chybě při vytváření adresářů na následujících zařízeních: "
 
-#: rapid/problemnotification.py:323
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "%(previousproblem)s - kromě toho: %(newproblem)s"
 
-#: rapid/problemnotification.py:331
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " Kromě toho došlo k dalším %(problems)s problémům."
 
-#: rapid/problemnotification.py:333
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " Kromě toho došlo k %(problem)s."
 
-#: rapid/problemnotification.py:342
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Metadata %(type)s chybí."
 
-#: rapid/problemnotification.py:344
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr "Následující metada chybí: "
 
-#: rapid/problemnotification.py:347
+#: rapid/problemnotification.py:371
 #, python-format
 msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr "%(missing_metadata_elements)s a %(final_missing_metadata_element)s."
 
-#: rapid/problemnotification.py:364
+#: rapid/problemnotification.py:388
 msgid "Problems in subfolder and filename generation"
 msgstr "Problémy při vytváření názvů pro složky a soubory"
 
-#: rapid/problemnotification.py:366
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr "Problém při vytváření názvů pro složky a soubory"
 
-#: rapid/problemnotification.py:369
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Problémy při vytváření %s"
 
-#: rapid/problemnotification.py:371
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Problém při vytváření %s"
 
-#: rapid/problemnotification.py:380
+#: rapid/problemnotification.py:404
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr "%(filetype)s už existuje, ale byl zálohován"
 
-#: rapid/problemnotification.py:382
+#: rapid/problemnotification.py:406
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr "Při kopírování %(filetype)s došlo k chybě, ale záloha proběhla"
 
-#: rapid/problemnotification.py:402
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr "Došlo k více problémům"
 
-#: rapid/problemnotification.py:404 rapid/subfolderfile.py:233
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr "Byly nalezeny fotky se stejným jménem, ale různým datem vzniku"
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr "chyby při zálohování"
 
-#: rapid/problemnotification.py:411
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr "Chyby při zálohování"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr "chyba při zálohování"
 
-#: rapid/problemnotification.py:414
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr "Chyba při zálohování"
 
 #. e.g.
-#: rapid/problemnotification.py:417
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s a %(backinguperror)s"
 
-#: rapid/rpdfile.py:153
+#: rapid/rpdfile.py:159
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/rpdfile.py:163
+#: rapid/rpdfile.py:169
 #, python-format
 msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 msgstr "hledám (nalezeno %(photos)s fotek a %(videos)s videí)..."
 
-#: rapid/subfolderfile.py:80
+#: rapid/subfolderfile.py:81
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr "podsložka a název souboru"
+
+#: rapid/subfolderfile.py:406
 msgid "Photo has already been downloaded"
 msgstr "Fotka už byla stažena"
 
-#: rapid/subfolderfile.py:302
+#: rapid/subfolderfile.py:407
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Zdroj: %(source)s"
 
-#: rapid/subfolderfile.py:354
-msgid "subfolder and filename"
-msgstr "podsložka a název souboru"
-
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:485
 msgid "Failed to create download subfolder"
 msgstr "Nepodařilo se vytvořit podsložku"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:486
 #, python-format
 msgid "Path: %s"
 msgstr "Cesta: %s"
 
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr ""
+
 #: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
+msgstr "Zaškrtnout _všechny"
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "_Dejte příspěvek..."
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr "_Nápověda online..."
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr "_Ohlásit problém..."
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr "_Odznačit vše"
+
+#: rapid/glade3/rapid.ui.h:16
 msgid "_File"
 msgstr "_Soubor"
 
-#: rapid/glade3/rapid.ui.h:3
+#: rapid/glade3/rapid.ui.h:17
 msgid "Download / Pause"
 msgstr "Stahování / Pauza"
 
-#: rapid/glade3/rapid.ui.h:4
+#: rapid/glade3/rapid.ui.h:18
 msgid "_Select"
 msgstr "_Vybrat"
 
-#: rapid/glade3/rapid.ui.h:5
+#: rapid/glade3/rapid.ui.h:19
 msgid "Select All Without _Job Code"
 msgstr "Vybrat všechny _bez štítku"
 
-#: rapid/glade3/rapid.ui.h:6
+#: rapid/glade3/rapid.ui.h:20
 msgid "Select All Wit_h Job Code"
 msgstr "Vybrat všechny se ští_tkem"
 
-#: rapid/glade3/rapid.ui.h:7
+#: rapid/glade3/rapid.ui.h:21
 msgid "_View"
 msgstr "_Zobrazení"
 
-#: rapid/glade3/rapid.ui.h:8
+#: rapid/glade3/rapid.ui.h:22
 msgid "_Error Log"
 msgstr "_Záznam chyb"
 
-#: rapid/glade3/rapid.ui.h:9
+#: rapid/glade3/rapid.ui.h:23
 msgid "_Clear Completed Downloads"
 msgstr "_Vyčistit kompletní stahování"
 
-#: rapid/glade3/rapid.ui.h:10
+#: rapid/glade3/rapid.ui.h:24
 msgid "Previous File"
 msgstr "Předchozí soubor"
 
-#: rapid/glade3/rapid.ui.h:11
+#: rapid/glade3/rapid.ui.h:25
 msgid "Next File"
 msgstr "Další soubor"
 
-#: rapid/glade3/rapid.ui.h:12
+#: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: rapid/glade3/rapid.ui.h:13
-msgid "_Make a Donation..."
-msgstr "_Dejte příspěvek..."
-
-#: rapid/glade3/rapid.ui.h:14
+#: rapid/glade3/rapid.ui.h:27
 msgid "_Translate this Application..."
 msgstr "_Přeložit tuto aplikaci..."
 
-#: rapid/glade3/rapid.ui.h:15
-msgid "_Check All"
-msgstr "Zaškrtnout _všechny"
-
-#: rapid/glade3/rapid.ui.h:16
-msgid "_Uncheck All"
-msgstr "_Odznačit vše"
-
-#: rapid/glade3/rapid.ui.h:17
+#: rapid/glade3/rapid.ui.h:28
 msgid "_Include in download"
 msgstr "Vybrat pro stažení"
 
-#: rapid/glade3/rapid.ui.h:18
+#: rapid/glade3/rapid.ui.h:29
 msgid "_Download"
 msgstr "_Stáhnout"
 
@@ -1765,7 +1859,7 @@ msgstr ""
 "externí disky."
 
 #: rapid/glade3/prefs.ui.h:69
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr "Zálohovat fotografie a videa při stahování"
 
 #: rapid/glade3/prefs.ui.h:70
@@ -1806,8 +1900,8 @@ msgid "Video backup location:"
 msgstr "Umístění zálohy videí:"
 
 #: rapid/glade3/prefs.ui.h:79
-msgid "Backup"
-msgstr "Záloha"
+msgid "Back up"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:80
 msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
@@ -1841,35 +1935,39 @@ msgstr "Ukončit program, i když stahování skončilo varováními nebo chybam
 msgid "Automatically rotate JPEG images"
 msgstr "Automaticky otáčet obrázky formátu JPEG"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:90
 msgid "Performance"
 msgstr "Výkon"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:91
 msgid "Generate thumbnails (slower)"
 msgstr "Generovat náhledy (pomalé)"
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:92
 msgid "Miscellaneous"
 msgstr "Různé"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Chybová obsluha</span>"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Konflikty jmen fotografií a videa</b>"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Add unique identifier"
 msgstr "Přidat unikátní identifikátor"
 
-#: rapid/glade3/prefs.ui.h:94
+#: rapid/glade3/prefs.ui.h:96
 msgid "Skip download"
 msgstr "Vynechat stahování"
 
-#: rapid/glade3/prefs.ui.h:95
+#: rapid/glade3/prefs.ui.h:97
 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."
@@ -1877,7 +1975,7 @@ msgstr ""
 "Pokud má fotka nebo video stejný název jako již existující soubor, vyberte, "
 "zda se má stahování přeskočit, nebo přejmenovat."
 
-#: rapid/glade3/prefs.ui.h:96
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1885,15 +1983,15 @@ msgstr ""
 "Vyberte, zda při zálohování přepsat na cílovém zařízení soubor se stejným "
 "jménem, nebo jeho zálohování přeskočit."
 
-#: rapid/glade3/prefs.ui.h:97
+#: rapid/glade3/prefs.ui.h:99
 msgid "Overwrite"
 msgstr "Přepsat"
 
-#: rapid/glade3/prefs.ui.h:98
+#: rapid/glade3/prefs.ui.h:100
 msgid "Skip"
 msgstr "Vynechat"
 
-#: rapid/glade3/prefs.ui.h:99
+#: rapid/glade3/prefs.ui.h:101
 msgid "Error Handling"
 msgstr "Chybová obsluha"
 
@@ -1995,15 +2093,9 @@ msgstr "Importovat fotky a videa spolehlivě"
 #~ msgid "Download copying error"
 #~ msgstr "Chyba kopírování obrázků"
 
-#~ msgid "_Report a Problem..."
-#~ msgstr "_Ohlásit problém..."
-
 #~ msgid "_Photos"
 #~ msgstr "_Fotografie"
 
-#~ msgid "_Get Help Online..."
-#~ msgstr "_Nápověda online..."
-
 #~ msgid "_Thumbnails"
 #~ msgstr "_Náhledy"
 
@@ -2051,6 +2143,9 @@ msgstr "Importovat fotky a videa spolehlivě"
 #~ msgid "<i>Example: /home/user/photos</i>"
 #~ msgstr "<i>Příklad: /home/user/photos</i>"
 
+#~ msgid "Backup"
+#~ msgstr "Záloha"
+
 #~ msgid "Backup location:"
 #~ msgstr "Umístění zálohy:"
 
diff --git a/po/da.po b/po/da.po
index a950382..3c65363 100644
--- a/po/da.po
+++ b/po/da.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-06-23 04:00-0500\n"
-"PO-Revision-Date: 2012-06-25 07:23+0000\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:14+0000\n"
 "Last-Translator: Torben Gundtofte-Bruun <torben@g-b.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 00:24+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:119
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:122
+#: rapid/rapid.py:127
 #, 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:157
+#: rapid/rapid.py:162
 msgid "Device"
 msgstr "Enhed"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:175
+#: rapid/rapid.py:180
 msgid "Size"
 msgstr "Størrelse"
 
-#: rapid/rapid.py:178
+#: rapid/rapid.py:183
 msgid "Download Progress"
 msgstr "Downloadfremgang"
 
-#: rapid/rapid.py:336
+#: rapid/rapid.py:343
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s kunne ikke afmonteres"
@@ -66,22 +66,22 @@ msgstr "%(device)s kunne ikke afmonteres"
 #. 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:1216
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr "gennemsøger..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1782
+#: rapid/rapid.py:1818
 msgid "the root of the file system"
 msgstr "filsystemets rod"
 
 #. message in dialog box which asks the user if they really want to be downloading from this location
-#: rapid/rapid.py:1786
+#: rapid/rapid.py:1822
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "henter fra %(location)s."
 
-#: rapid/rapid.py:1787
+#: rapid/rapid.py:1823
 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 hente herfra? På nogle systemer kan det tage lang tid at "
 "gennemse denne kilde."
 
-#: rapid/rapid.py:2209
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr "Hent"
 
-#: rapid/rapid.py:2212
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr "Pause"
 
-#: rapid/rapid.py:2317
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -108,7 +108,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2320
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -117,176 +117,187 @@ msgstr ""
 "Denne download mappe er ugyldig:\n"
 "%s"
 
-#: rapid/rapid.py:2321
+#: rapid/rapid.py:2380
 msgid "Download cannot proceed"
 msgstr "Download kan ikke fortsætte"
 
-#: rapid/rapid.py:2700
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "fotos"
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "videoer"
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr ""
+
+#: rapid/rapid.py:2802
 msgid "About 1 second remaining"
 msgstr "Cirka 1 sekund endnu"
 
-#: rapid/rapid.py:2702
+#: rapid/rapid.py:2804
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Cirka %i sekunder endnu"
 
-#: rapid/rapid.py:2704
+#: rapid/rapid.py:2806
 msgid "About 1 minute remaining"
 msgstr "Cirka 1 minut endnu"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:2709
+#: rapid/rapid.py:2811
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Cirka %(minutes)i:%(seconds)02i sekunder endnu"
 
-#: rapid/rapid.py:2731 rapid/rpdfile.py:123
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
 msgid "photos and videos"
 msgstr "fotos og videoer"
 
-#: rapid/rapid.py:2733 rapid/rpdfile.py:125
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
 msgid "photos or videos"
 msgstr "fotos eller videoer"
 
-#: rapid/rapid.py:2736 rapid/rapid.py:3558 rapid/rpdfile.py:128
-msgid "videos"
-msgstr "videoer"
-
-#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
-#: rapid/rpdfile.py:291
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
 msgid "video"
 msgstr "video"
 
-#: rapid/rapid.py:2741 rapid/rapid.py:3556 rapid/rpdfile.py:133
-msgid "photos"
-msgstr "fotos"
-
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2743 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
-#: rapid/rpdfile.py:272
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
 msgid "photo"
 msgstr "foto"
 
-#: rapid/rapid.py:2770
+#: rapid/rapid.py:2872
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s hentet"
 
-#: rapid/rapid.py:2774
+#: rapid/rapid.py:2876
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s kunne ikke hentes"
 
-#: rapid/rapid.py:2777 rapid/rapid.py:2829
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
 msgid "warnings"
 msgstr "advarsler"
 
-#: rapid/rapid.py:2786
+#: rapid/rapid.py:2892
 msgid "All downloads complete"
 msgstr "Alle downloads er afsluttet"
 
-#: rapid/rapid.py:2792 rapid/rapid.py:2801 rapid/rapid.py:2810
-#: rapid/rapid.py:2819 rapid/rapid.py:2827
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2794 rapid/rapid.py:2812
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s hentet"
 
-#: rapid/rapid.py:2803 rapid/rapid.py:2821
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s kunne ikke hentes"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2860
+#: rapid/rapid.py:2970
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr "%(number)s af %(total)s %(filetypes)s (%(remaining)s endnu)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:2977
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s af %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3222
+#: rapid/rapid.py:3331
 msgid "From"
 msgstr "Fra"
 
-#: rapid/rapid.py:3230
+#: rapid/rapid.py:3339
 msgid "Auto Detect"
 msgstr "Opdag automatisk"
 
-#: rapid/rapid.py:3234 rapid/preferencesdialog.py:1327
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Vælg en mappe der indeholder %(file_types)s"
 
-#: rapid/rapid.py:3275
+#: rapid/rapid.py:3384
 msgid "Copy"
 msgstr "Kopier"
 
-#: rapid/rapid.py:3288
+#: rapid/rapid.py:3397
 msgid "Move"
 msgstr "Flyt"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3419
 msgid "To"
 msgstr "Til"
 
-#: rapid/rapid.py:3317 rapid/rapid.py:3986
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
 msgid "Photos:"
 msgstr "Fotos:"
 
-#: rapid/rapid.py:3320 rapid/preferencesdialog.py:1164
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
 msgid "Select a folder to download photos to"
 msgstr "Vælg en mappe at downloade fotos til"
 
-#: rapid/rapid.py:3332 rapid/rapid.py:3986
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
 msgid "Videos:"
 msgstr "Videoer:"
 
-#: rapid/rapid.py:3334 rapid/preferencesdialog.py:1182
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
 msgid "Select a folder to download videos to"
 msgstr "Vælg en mappe at downloade videoer til"
 
-#: rapid/rapid.py:3526
+#: rapid/rapid.py:3650
 msgid "and"
 msgstr "og"
 
-#: rapid/rapid.py:3531
+#: rapid/rapid.py:3655
 msgid "Using backup devices"
 msgstr "Benytter backup enheder"
 
-#: rapid/rapid.py:3533
+#: rapid/rapid.py:3657
 msgid "Using backup device"
 msgstr "Benytter backup enhed"
 
-#: rapid/rapid.py:3535
+#: rapid/rapid.py:3659
 msgid "No backup devices detected"
 msgstr "Ingen backup enheder fundet"
 
-#: rapid/rapid.py:3562
+#: rapid/rapid.py:3686
 msgid "Free space:"
 msgstr "Fri plads:"
 
 #. (videos) or (photos) will be appended to the free space message displayed to the
 #. user in the status bar.
 #. you should only translate this if your language does not use parantheses
-#: rapid/rapid.py:3574
+#: rapid/rapid.py:3698
 #, 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:3578
+#: rapid/rapid.py:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -294,87 +305,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:3583
+#: rapid/rapid.py:3707
 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:3588
+#: rapid/rapid.py:3712
 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:3594
+#: rapid/rapid.py:3718
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s fri plads"
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3602
+#: rapid/rapid.py:3726
 #, python-format
 msgid "Backing up photos and videos to %(path)s"
 msgstr "Sikkerhedskopierer fotos og videoer til %(path)s"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3605
+#: rapid/rapid.py:3729
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Tager sikkerhedskopi til %(path)s"
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3608
+#: rapid/rapid.py:3732
 #, python-format
 msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr "Sikkerhedskopierer fotos til %(path)s og videoer til %(path2)s"
 
-#: rapid/rapid.py:3615
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3644
+#: rapid/rapid.py:3768
 msgid "Program preferences are invalid"
 msgstr "Programmets indstillinger er ugyldige"
 
-#: rapid/rapid.py:3770 rapid/rpdfile.py:273
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
 msgid "Photo"
 msgstr "Foto"
 
-#: rapid/rapid.py:3772 rapid/rpdfile.py:292
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:3781
+#: rapid/rapid.py:3921
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s download mappe findes ikke"
 
-#: rapid/rapid.py:3783 rapid/rapid.py:3797 rapid/rapid.py:3810
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
 msgid "Folder: %s"
 msgstr "Mappe: %s"
 
-#: rapid/rapid.py:3795
+#: rapid/rapid.py:3935
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s download mappe er ugyldig"
 
-#: rapid/rapid.py:3808
+#: rapid/rapid.py:3948
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s download mappe er skrivebeskyttet"
 
-#: rapid/rapid.py:3894
+#: rapid/rapid.py:4034
 msgid "Thumbnails"
 msgstr "Små billeder"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3949
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -383,21 +394,21 @@ msgstr ""
 "vis programinformation på kommandolinien mens programmet kører (standard: "
 "%default)"
 
-#: rapid/rapid.py:3950
+#: rapid/rapid.py:4090
 msgid "display debugging information when run from the command line"
 msgstr ""
 "vis fejlsøgningsinformation når programmet startes fra kommandolinien"
 
-#: rapid/rapid.py:3951
+#: rapid/rapid.py:4091
 msgid "only output errors to the command line"
 msgstr "vis kun fejl på kommandolinien"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3953
+#: rapid/rapid.py:4093
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr "vis hvilke foto og video formater programmet kender, og afslut"
 
-#: rapid/rapid.py:3955
+#: rapid/rapid.py:4095
 msgid ""
 "automatically detect devices from which to download, overwriting existing "
 "program preferences"
@@ -405,7 +416,7 @@ msgstr ""
 "opdag enheder automatisk, hvorfra der skal hentes,  og overskriv "
 "eksisterende programindstillinger"
 
-#: rapid/rapid.py:3956
+#: rapid/rapid.py:4096
 msgid ""
 "manually specify the PATH of the device from which to download, overwriting "
 "existing program preferences"
@@ -413,11 +424,11 @@ msgstr ""
 "angiv stien manuelt, hvorfra der skal hentes, og overskriv eksisterende "
 "programindstillinger"
 
-#: rapid/rapid.py:3957
+#: rapid/rapid.py:4097
 msgid "reset all program settings and preferences and exit"
 msgstr "nulstil alle programindstillinger og afslut"
 
-#: rapid/rapid.py:3970
+#: rapid/rapid.py:4110
 msgid ""
 "Error: specify device auto-detection or manually specify a device's path "
 "from which to download, but do not do both."
@@ -425,25 +436,26 @@ msgstr ""
 "Fejl: angiv automatisk opdagelse af enheder, eller angiv stien manuelt, "
 "hvorfra der skal hentes, men angiv ikke begge dele."
 
-#: rapid/rapid.py:3991
+#: rapid/rapid.py:4133
 #, python-format
 msgid "and %s"
 msgstr "og %s"
 
-#: rapid/rapid.py:3999
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
 msgstr "Alle indstillinger er blevet nulstillet"
 
-#: rapid/backupfile.py:157 rapid/backupfile.py:180
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
 msgid "Backing up error"
 msgstr "Fejl ved sikkerhedskopiering"
 
-#: rapid/backupfile.py:159
+#: rapid/backupfile.py:151
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Destinationsmappe kunne ikke oprettes: %(directory)s\n"
 
-#: rapid/backupfile.py:161 rapid/backupfile.py:182 rapid/subfolderfile.py:199
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -452,13 +464,29 @@ msgstr ""
 "Kilde: %(source)s\n"
 "Destination: %(destination)s"
 
-#: rapid/backupfile.py:164 rapid/backupfile.py:184
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Fejl: %(inst)s"
 
-#: rapid/copyfiles.py:163 rapid/subfolderfile.py:214
-#: rapid/subfolderfile.py:347 rapid/subfolderfile.py:365
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -467,6 +495,10 @@ msgstr ""
 "%(problem)s\n"
 "Fil: %(file)s"
 
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr ""
+
 #: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Enhed fundet"
@@ -948,20 +980,20 @@ msgstr "Angiv en sti som aldrig skal gennemsøges efter fotos og videoer"
 msgid "Path:"
 msgstr "Sti:"
 
-#: rapid/preferencesdialog.py:1082
+#: rapid/preferencesdialog.py:1092
 msgid "Job Code"
 msgstr "Jobkode"
 
-#: rapid/preferencesdialog.py:1353
+#: rapid/preferencesdialog.py:1363
 msgid "Select a folder in which to backup photos"
 msgstr "Vælg en mappe til sikkerhedskopier af fotos"
 
-#: rapid/preferencesdialog.py:1366
+#: rapid/preferencesdialog.py:1376
 msgid "Select a folder in which to backup videos"
 msgstr "Vælg en mappe til sikkerhedskopier af videoer"
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/preferencesdialog.py:1461
+#: rapid/preferencesdialog.py:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -969,7 +1001,7 @@ msgstr ""
 "<i><b>Advarsel:</b> Metadata er utlistrækkelige til at generere navnet. Vælg "
 "andre muligheder for omdøbning.</i>"
 
-#: rapid/preferencesdialog.py:1512
+#: rapid/preferencesdialog.py:1524
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -978,13 +1010,13 @@ msgstr ""
 "Vælg andre muligheder for navngivning af undermapper.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/preferencesdialog.py:1515
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Eksempel: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1605
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -994,7 +1026,7 @@ msgstr ""
 "Indstillingerne til %(filetype)s undermappen er ugyldige.\n"
 "De bliver nulstillet til deres standardværdier."
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1762
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -1005,7 +1037,7 @@ msgstr ""
 "ændrer dem:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1752
+#: rapid/preferencesdialog.py:1764
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -1016,17 +1048,17 @@ msgstr ""
 "ændrer det:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1753
+#: rapid/preferencesdialog.py:1765
 msgid "Invalid regular expression"
 msgstr "Ugyldigt regulært udtryk"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1934
+#: rapid/preferencesdialog.py:1949
 msgid "externaldrive1"
 msgstr "eksterntdrev1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1936
+#: rapid/preferencesdialog.py:1951
 msgid "externaldrive2"
 msgstr "eksterntdrev2"
 
@@ -1103,55 +1135,60 @@ msgid "Stockholm"
 msgstr "Stockholm"
 
 #. components
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:358
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
 msgstr "undermappe"
 
-#: rapid/problemnotification.py:28 rapid/subfolderfile.py:356
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr "filnavn"
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr "Værdi for dato og klokkeslæt %s forekommer ugyldigt."
 
-#: rapid/problemnotification.py:82
+#: rapid/problemnotification.py:86
 msgid "Filename does not have an extension."
 msgstr "Filnavnet har ingen udvidelse."
 
 #. a number component is something like the 8346 in IMG_8346.JPG
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:88
 msgid "Filename does not have a number component."
 msgstr "Filnavnet indeholder ingen tal."
 
-#: rapid/problemnotification.py:85
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr "Kunne ikke generere component %s."
 
 #. a generic problem
-#: rapid/problemnotification.py:87
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr "%(filetype)s metadata kan ikke læses"
 
-#: rapid/problemnotification.py:89
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "%(filetype)s %(area)s kunne ikke genereres"
 
-#: rapid/problemnotification.py:91 rapid/problemnotification.py:92
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr "Der opstod en fejl ved kopiering af %(filetype)s"
 
-#: rapid/problemnotification.py:94 rapid/problemnotification.py:95
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr ""
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "%(filetype)s findes allerede"
 
-#: rapid/problemnotification.py:98
+#: rapid/problemnotification.py:105
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1160,7 +1197,7 @@ msgstr ""
 "Der kunne ikke tages sikkerhedskopi af %(filetype)s, fordi der ikke findes "
 "egnede placeringer til sikkerhedskopierne."
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:110
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -1169,12 +1206,12 @@ msgstr ""
 "%(image1)s blev taget den %(image1_date)s kl. %(image1_time)s, og %(image2)s "
 "den %(image2_date)s kl. %(image2_time)s."
 
-#: rapid/problemnotification.py:104
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "%(filetype)s er allerede blevet downloadet"
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:115
 #, python-format
 msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
@@ -1183,27 +1220,33 @@ msgstr ""
 "De eksisterende %(filetype)s er sidst ændret den %(date)s klokken %(time)s. "
 "Entydig angivelse '%(identifier)s' blev tilføjet."
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:116
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 "De eksisterende %(filetype)s er sidst ændret den %(date)s klokken %(time)s."
 
-#: rapid/problemnotification.py:110
+#: rapid/problemnotification.py:117
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr "Der mangler data til navngivning af %(filetype)sne."
 
-#: rapid/problemnotification.py:112
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Fejl: %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:202
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr "Metadata kan være korrupt."
 
-#: rapid/problemnotification.py:205
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
@@ -1211,28 +1254,28 @@ msgstr ""
 "Filnavnet, udvidelsen og Exif informationerne antyder, at filen allerede er "
 "blevet downloadet."
 
-#: rapid/problemnotification.py:224
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " Filen blev sikkerhedskopieret til %(volume)s"
 
-#: rapid/problemnotification.py:226
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr " Filen blev sikkerhedskopieret til disse enheder: "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:229 rapid/problemnotification.py:290
-#: rapid/problemnotification.py:302
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s og %(final_volume)s."
 
-#: rapid/problemnotification.py:241
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
@@ -1240,260 +1283,311 @@ msgid ""
 msgstr ""
 "Der findes fotos med ens filnavne men forskellige datoer: %(details)s"
 
-#: rapid/problemnotification.py:258
+#: rapid/problemnotification.py:269
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr "Der opstod en fejl ved sikkerhedskopiering til %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:260
+#: rapid/problemnotification.py:271
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr "Der opstod en fejl ved sikkerhedskopiering til %(volume)s."
 
-#: rapid/problemnotification.py:262
+#: rapid/problemnotification.py:273
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr "Der opstod fejl ved sikkerhedskopiering til de følgende enheder: "
 
-#: rapid/problemnotification.py:266 rapid/problemnotification.py:314
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:268
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:272 rapid/problemnotification.py:316
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr "%(volumes)s og %(volume)s (%(inst)s)."
 
-#: rapid/problemnotification.py:277
+#: rapid/problemnotification.py:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s og %(volume)s."
 
-#: rapid/problemnotification.py:285
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "Sikkerhedskopi findes allerede på %(volume)s."
 
-#: rapid/problemnotification.py:287
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr "Sikkerhedskopier findes allerede her: "
 
-#: rapid/problemnotification.py:297
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "Sikkerhedskopi blev overskrevet på %(volume)s."
 
-#: rapid/problemnotification.py:299
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr "Sikkerhedskopier blev overskrevet på disse enheder: "
 
-#: rapid/problemnotification.py:310
+#: rapid/problemnotification.py:321
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr "Der opstod en fejl ved oprettelse af mapper på %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:312
+#: rapid/problemnotification.py:323
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr "Der opstod fejl ved oprettelse af mapper på disse enheder: "
 
-#: rapid/problemnotification.py:323
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "%(previousproblem)s Og %(newproblem)s"
 
-#: rapid/problemnotification.py:331
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " Desuden opstod der %(problems)s."
 
-#: rapid/problemnotification.py:333
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " Desuden opstod der %(problem)s."
 
-#: rapid/problemnotification.py:342
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Der mangler %(type)s metadata."
 
-#: rapid/problemnotification.py:344
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr "Følgende metadata mangler: "
 
-#: rapid/problemnotification.py:347
+#: rapid/problemnotification.py:371
 #, 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:364
+#: rapid/problemnotification.py:388
 msgid "Problems in subfolder and filename generation"
 msgstr "Problemer ved generering af undermapper og filnavne"
 
-#: rapid/problemnotification.py:366
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr "Problem ved generering af undermapper og filnavne"
 
-#: rapid/problemnotification.py:369
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Problemer ved generering af %s"
 
-#: rapid/problemnotification.py:371
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Problem ved generering af %s"
 
-#: rapid/problemnotification.py:380
+#: rapid/problemnotification.py:404
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr "%(filetype)s findes allerede, men er sikkerhedskopieret"
 
-#: rapid/problemnotification.py:382
+#: rapid/problemnotification.py:406
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 "Der opstod en fejl ved kopiering af %(filetype)s, men det blev "
 "sikkerhedskopieret"
 
-#: rapid/problemnotification.py:402
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr "Der opstod adskillige problemer"
 
-#: rapid/problemnotification.py:404 rapid/subfolderfile.py:233
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 "Der findes fotos med ens filnavne men forskellige klokkeslæt: %(details)s"
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr "der opstod fejl ved sikkerhedskopiering"
 
-#: rapid/problemnotification.py:411
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr "Der opstod fejl ved sikkerhedskopiering"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr "der opstod en fejl ved sikkerhedskopiering"
 
-#: rapid/problemnotification.py:414
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr "Der opstod en fejl ved sikkerhedskopiering"
 
 #. e.g.
-#: rapid/problemnotification.py:417
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, og %(backinguperror)s"
 
-#: rapid/rpdfile.py:153
+#: rapid/rpdfile.py:159
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/rpdfile.py:163
+#: rapid/rpdfile.py:169
 #, python-format
 msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 msgstr "gennemsøger (%(photos)s fotos og %(videos)s videoer fundet)..."
 
-#: rapid/subfolderfile.py:80
+#: rapid/subfolderfile.py:81
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr "undermappe og filnavn"
+
+#: rapid/subfolderfile.py:406
 msgid "Photo has already been downloaded"
 msgstr "Fotoet er allerede blevet downloadet"
 
-#: rapid/subfolderfile.py:302
+#: rapid/subfolderfile.py:407
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Kilde: %(source)s"
 
-#: rapid/subfolderfile.py:354
-msgid "subfolder and filename"
-msgstr "undermappe og filnavn"
-
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:485
 msgid "Failed to create download subfolder"
 msgstr "Kunne ikke oprette undermappe"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:486
 #, python-format
 msgid "Path: %s"
 msgstr "Sti: %s"
 
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr ""
+
 #: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
+msgstr "_Markér alle"
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "_Giv et bidrag..."
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr "_Afmarkér alle"
+
+#: rapid/glade3/rapid.ui.h:16
 msgid "_File"
 msgstr "_Fil"
 
-#: rapid/glade3/rapid.ui.h:3
+#: rapid/glade3/rapid.ui.h:17
 msgid "Download / Pause"
 msgstr "Download / Pause"
 
-#: rapid/glade3/rapid.ui.h:4
+#: rapid/glade3/rapid.ui.h:18
 msgid "_Select"
 msgstr "_Markér"
 
-#: rapid/glade3/rapid.ui.h:5
+#: rapid/glade3/rapid.ui.h:19
 msgid "Select All Without _Job Code"
 msgstr "Markér alle _uden jobkode"
 
-#: rapid/glade3/rapid.ui.h:6
+#: rapid/glade3/rapid.ui.h:20
 msgid "Select All Wit_h Job Code"
 msgstr "Markér alle med _jobkode"
 
-#: rapid/glade3/rapid.ui.h:7
+#: rapid/glade3/rapid.ui.h:21
 msgid "_View"
 msgstr "_Vis"
 
-#: rapid/glade3/rapid.ui.h:8
+#: rapid/glade3/rapid.ui.h:22
 msgid "_Error Log"
 msgstr "_Fejl-log"
 
-#: rapid/glade3/rapid.ui.h:9
+#: rapid/glade3/rapid.ui.h:23
 msgid "_Clear Completed Downloads"
 msgstr "_Ryd afsluttede downloads"
 
-#: rapid/glade3/rapid.ui.h:10
+#: rapid/glade3/rapid.ui.h:24
 msgid "Previous File"
 msgstr "Forrige fil"
 
-#: rapid/glade3/rapid.ui.h:11
+#: rapid/glade3/rapid.ui.h:25
 msgid "Next File"
 msgstr "Næste fil"
 
-#: rapid/glade3/rapid.ui.h:12
+#: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
 msgstr "_Hjælp"
 
-#: rapid/glade3/rapid.ui.h:13
-msgid "_Make a Donation..."
-msgstr "_Giv et bidrag..."
-
-#: rapid/glade3/rapid.ui.h:14
+#: rapid/glade3/rapid.ui.h:27
 msgid "_Translate this Application..."
 msgstr "_Oversæt denne applikation..."
 
-#: rapid/glade3/rapid.ui.h:15
-msgid "_Check All"
-msgstr "_Markér alle"
-
-#: rapid/glade3/rapid.ui.h:16
-msgid "_Uncheck All"
-msgstr "_Afmarkér alle"
-
-#: rapid/glade3/rapid.ui.h:17
+#: rapid/glade3/rapid.ui.h:28
 msgid "_Include in download"
 msgstr "_Indkludér i download"
 
-#: rapid/glade3/rapid.ui.h:18
+#: rapid/glade3/rapid.ui.h:29
 msgid "_Download"
 msgstr "_Download"
 
@@ -1812,7 +1906,7 @@ msgstr ""
 "downloades, for eksempel en ekstern harddisk."
 
 #: rapid/glade3/prefs.ui.h:69
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr "Tag sikkerhedskopi af fotos og videoer mens de downloades"
 
 #: rapid/glade3/prefs.ui.h:70
@@ -1854,8 +1948,8 @@ msgid "Video backup location:"
 msgstr "Placering af video sikkerhedskopi:"
 
 #: rapid/glade3/prefs.ui.h:79
-msgid "Backup"
-msgstr "Sikkerhedskopi"
+msgid "Back up"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:80
 msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
@@ -1890,35 +1984,39 @@ msgstr ""
 msgid "Automatically rotate JPEG images"
 msgstr "Rotér JPEG billeder automatisk"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:90
 msgid "Performance"
 msgstr "Ydeevne"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:91
 msgid "Generate thumbnails (slower)"
 msgstr "Dan små billeder"
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:92
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Fejlhåndtering</span>"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Foto og video navnekonflikter</b>"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Add unique identifier"
 msgstr "Tilføj entydig angivelse"
 
-#: rapid/glade3/prefs.ui.h:94
+#: rapid/glade3/prefs.ui.h:96
 msgid "Skip download"
 msgstr "Spring download over"
 
-#: rapid/glade3/prefs.ui.h:95
+#: rapid/glade3/prefs.ui.h:97
 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."
@@ -1927,7 +2025,7 @@ msgstr ""
 "tilføjes en entydig kending, når et foto eller en video med samme navn "
 "allerede er downloadet."
 
-#: rapid/glade3/prefs.ui.h:96
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1935,18 +2033,21 @@ msgstr ""
 "Vælg, om et foto eller en video skal springes over eller overskrives, når "
 "sikkerhedskopien allerede indeholder et foto eller en video med samme navn."
 
-#: rapid/glade3/prefs.ui.h:97
+#: rapid/glade3/prefs.ui.h:99
 msgid "Overwrite"
 msgstr "Overskriv"
 
-#: rapid/glade3/prefs.ui.h:98
+#: rapid/glade3/prefs.ui.h:100
 msgid "Skip"
 msgstr "Spring over"
 
-#: rapid/glade3/prefs.ui.h:99
+#: rapid/glade3/prefs.ui.h:101
 msgid "Error Handling"
 msgstr "Fejlhåndtering"
 
 #: rapid/glade3/about.ui.h:1
 msgid "Import your photos and videos efficiently and reliably"
 msgstr "Importér dine fotos og videoer effektivt og pålideligt"
+
+#~ msgid "Backup"
+#~ msgstr "Sikkerhedskopi"
diff --git a/po/de.po b/po/de.po
index e365a90..16f84c1 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-06-23 04:00-0500\n"
-"PO-Revision-Date: 2013-01-03 18:47+0000\n"
-"Last-Translator: Dennis Baudys <Unknown>\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:16+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-22 23:36+0000\n"
-"X-Generator: Launchpad (build 16430)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:119
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:122
+#: rapid/rapid.py:127
 #, 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:157
+#: rapid/rapid.py:162
 msgid "Device"
 msgstr "Laufwerk"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:175
+#: rapid/rapid.py:180
 msgid "Size"
 msgstr "Grösse"
 
-#: rapid/rapid.py:178
+#: rapid/rapid.py:183
 msgid "Download Progress"
 msgstr "Fortschritt des Herunterladens"
 
-#: rapid/rapid.py:336
+#: rapid/rapid.py:343
 #, 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:1216
+#: rapid/rapid.py:1241
 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:1782
+#: rapid/rapid.py:1818
 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:1786
+#: rapid/rapid.py:1822
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Herunterladen von %(location)s."
 
-#: rapid/rapid.py:1787
+#: rapid/rapid.py:1823
 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:2209
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr "Herunterladen"
 
-#: rapid/rapid.py:2212
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr "Anhalten"
 
-#: rapid/rapid.py:2317
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -108,7 +108,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2320
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -117,176 +117,187 @@ msgstr ""
 "Dieses Download-Verzeichnis ist ungültig:\n"
 "%s"
 
-#: rapid/rapid.py:2321
+#: rapid/rapid.py:2380
 msgid "Download cannot proceed"
 msgstr "Der Download kann nicht weitergeführt werden"
 
-#: rapid/rapid.py:2700
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "Bilder"
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "Filme"
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr ""
+
+#: rapid/rapid.py:2802
 msgid "About 1 second remaining"
 msgstr "Etwa 1 Sekunde verbleibend"
 
-#: rapid/rapid.py:2702
+#: rapid/rapid.py:2804
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Etwa %i Sekunden verbleibend"
 
-#: rapid/rapid.py:2704
+#: rapid/rapid.py:2806
 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:2709
+#: rapid/rapid.py:2811
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Etwa %(minutes)i:%(seconds)02i Minuten verbleibend"
 
-#: rapid/rapid.py:2731 rapid/rpdfile.py:123
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
 msgid "photos and videos"
 msgstr "Bilder und Filme"
 
-#: rapid/rapid.py:2733 rapid/rpdfile.py:125
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
 msgid "photos or videos"
 msgstr "Bilder oder Filme"
 
-#: rapid/rapid.py:2736 rapid/rapid.py:3558 rapid/rpdfile.py:128
-msgid "videos"
-msgstr "Filme"
-
-#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
-#: rapid/rpdfile.py:291
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
 msgid "video"
 msgstr "Film"
 
-#: 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:2743 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
-#: rapid/rpdfile.py:272
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
 msgid "photo"
 msgstr "Bild"
 
-#: rapid/rapid.py:2770
+#: rapid/rapid.py:2872
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s heruntergeladen"
 
-#: rapid/rapid.py:2774
+#: rapid/rapid.py:2876
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s konnten nicht heruntergeladen werden"
 
-#: rapid/rapid.py:2777 rapid/rapid.py:2829
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
 msgid "warnings"
 msgstr "Warnungen"
 
-#: rapid/rapid.py:2786
+#: rapid/rapid.py:2892
 msgid "All downloads complete"
 msgstr "Alle Downloads sind abgeschlossen"
 
-#: rapid/rapid.py:2792 rapid/rapid.py:2801 rapid/rapid.py:2810
-#: rapid/rapid.py:2819 rapid/rapid.py:2827
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2794 rapid/rapid.py:2812
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s heruntergeladen"
 
-#: rapid/rapid.py:2803 rapid/rapid.py:2821
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, 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:2860
+#: rapid/rapid.py:2970
 #, 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:2867
+#: rapid/rapid.py:2977
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s von %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3222
+#: rapid/rapid.py:3331
 msgid "From"
 msgstr "Von"
 
-#: rapid/rapid.py:3230
+#: rapid/rapid.py:3339
 msgid "Auto Detect"
 msgstr "Auto-Erkennung"
 
-#: rapid/rapid.py:3234 rapid/preferencesdialog.py:1327
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, 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:3275
+#: rapid/rapid.py:3384
 msgid "Copy"
 msgstr "Kopieren"
 
-#: rapid/rapid.py:3288
+#: rapid/rapid.py:3397
 msgid "Move"
 msgstr "Verschieben"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3419
 msgid "To"
 msgstr "Nach"
 
-#: rapid/rapid.py:3317 rapid/rapid.py:3986
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
 msgid "Photos:"
 msgstr "Bilder:"
 
-#: rapid/rapid.py:3320 rapid/preferencesdialog.py:1164
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
 msgid "Select a folder to download photos to"
 msgstr "Wählen Sie ein Verzeichnis für den Download der Bilder"
 
-#: rapid/rapid.py:3332 rapid/rapid.py:3986
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
 msgid "Videos:"
 msgstr "Filme:"
 
-#: rapid/rapid.py:3334 rapid/preferencesdialog.py:1182
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
 msgid "Select a folder to download videos to"
 msgstr "Wählen Sie einen Ordner für den Download von Filmen"
 
-#: rapid/rapid.py:3526
+#: rapid/rapid.py:3650
 msgid "and"
 msgstr "und"
 
-#: rapid/rapid.py:3531
+#: rapid/rapid.py:3655
 msgid "Using backup devices"
 msgstr "Die Sicherungslaufwerke werden verwendet"
 
-#: rapid/rapid.py:3533
+#: rapid/rapid.py:3657
 msgid "Using backup device"
 msgstr "Das Sicherungslaufwerk wird verwendet"
 
-#: rapid/rapid.py:3535
+#: rapid/rapid.py:3659
 msgid "No backup devices detected"
 msgstr "Es wurden keine Sicherungslaufwerke gefunden"
 
-#: rapid/rapid.py:3562
+#: rapid/rapid.py:3686
 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:3574
+#: rapid/rapid.py:3698
 #, 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:3578
+#: rapid/rapid.py:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -294,89 +305,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:3583
+#: rapid/rapid.py:3707
 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:3588
+#: rapid/rapid.py:3712
 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:3594
+#: rapid/rapid.py:3718
 #, 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:3602
+#: rapid/rapid.py:3726
 #, 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:3605
+#: rapid/rapid.py:3729
 #, 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:3608
+#: rapid/rapid.py:3732
 #, 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:3615
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3644
+#: rapid/rapid.py:3768
 msgid "Program preferences are invalid"
 msgstr "Die Benutzervoreinstellungen sind ungültig"
 
-#: rapid/rapid.py:3770 rapid/rpdfile.py:273
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
 msgid "Photo"
 msgstr "Bild"
 
-#: rapid/rapid.py:3772 rapid/rpdfile.py:292
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "Film"
 
-#: rapid/rapid.py:3781
+#: rapid/rapid.py:3921
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s Download-Verzeichnis existiert nicht"
 
-#: rapid/rapid.py:3783 rapid/rapid.py:3797 rapid/rapid.py:3810
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
 msgid "Folder: %s"
 msgstr "Verzeichnis: %s"
 
-#: rapid/rapid.py:3795
+#: rapid/rapid.py:3935
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s Download-Verzeichnis ist ungültig"
 
-#: rapid/rapid.py:3808
+#: rapid/rapid.py:3948
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s Download-Verzeichnis ist schreibgeschützt"
 
-#: rapid/rapid.py:3894
+#: rapid/rapid.py:4034
 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:3949
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -385,23 +396,23 @@ msgstr ""
 "Zeige die Programminformationen an, wenn das Programm aus der Kommandozeile "
 "aufgerufen wurde  (Voreinstellung: %default)"
 
-#: rapid/rapid.py:3950
+#: rapid/rapid.py:4090
 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:3951
+#: rapid/rapid.py:4091
 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:3953
+#: rapid/rapid.py:4093
 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:3955
+#: rapid/rapid.py:4095
 msgid ""
 "automatically detect devices from which to download, overwriting existing "
 "program preferences"
@@ -409,7 +420,7 @@ msgstr ""
 "Laufwerke zum Herunterladen automatisch erkennen, bestehende "
 "Programmeinstellungen übergehen"
 
-#: rapid/rapid.py:3956
+#: rapid/rapid.py:4096
 msgid ""
 "manually specify the PATH of the device from which to download, overwriting "
 "existing program preferences"
@@ -417,11 +428,11 @@ msgstr ""
 "PFAD zum Laufwerk für das Herunterladen manuell angeben, bestehende "
 "Programmeinstellungen übergehen"
 
-#: rapid/rapid.py:3957
+#: rapid/rapid.py:4097
 msgid "reset all program settings and preferences and exit"
 msgstr "Alle Einstellungen auf Standardwerte zurücksetzten und beenden"
 
-#: rapid/rapid.py:3970
+#: rapid/rapid.py:4110
 msgid ""
 "Error: specify device auto-detection or manually specify a device's path "
 "from which to download, but do not do both."
@@ -430,25 +441,26 @@ msgstr ""
 "erkennen« oder »PFAD zum Laufwerk für das Herunterladen manuell angeben«, "
 "aber nicht beides gleichzeitig."
 
-#: rapid/rapid.py:3991
+#: rapid/rapid.py:4133
 #, python-format
 msgid "and %s"
 msgstr "und %s"
 
-#: rapid/rapid.py:3999
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
 msgstr "Alle Einstellungen wurden zurückgesetzt"
 
-#: rapid/backupfile.py:157 rapid/backupfile.py:180
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
 msgid "Backing up error"
 msgstr "Fehler beim Erstellen der Sicherungskopie"
 
-#: rapid/backupfile.py:159
+#: rapid/backupfile.py:151
 #, 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:161 rapid/backupfile.py:182 rapid/subfolderfile.py:199
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -457,13 +469,29 @@ msgstr ""
 "Quelle: %(source)s\n"
 "Ziel: %(destination)s"
 
-#: rapid/backupfile.py:164 rapid/backupfile.py:184
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Fehler: %(inst)s"
 
-#: rapid/copyfiles.py:163 rapid/subfolderfile.py:214
-#: rapid/subfolderfile.py:347 rapid/subfolderfile.py:365
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -472,6 +500,10 @@ msgstr ""
 "%(problem)s\n"
 "Datei: %(file)s"
 
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr ""
+
 #: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Laufwerk gefunden"
@@ -961,22 +993,22 @@ msgstr ""
 msgid "Path:"
 msgstr "Pfad:"
 
-#: rapid/preferencesdialog.py:1082
+#: rapid/preferencesdialog.py:1092
 msgid "Job Code"
 msgstr "Auftragsbezeichnung"
 
-#: rapid/preferencesdialog.py:1353
+#: rapid/preferencesdialog.py:1363
 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:1366
+#: rapid/preferencesdialog.py:1376
 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:1461
+#: rapid/preferencesdialog.py:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -984,7 +1016,7 @@ msgstr ""
 "<i><b>Warnung:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
 
-#: rapid/preferencesdialog.py:1512
+#: rapid/preferencesdialog.py:1524
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -994,13 +1026,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:1515
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Beispiel: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1605
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -1011,7 +1043,7 @@ msgstr ""
 "und können nicht verwendet werden.\n"
 "Sie werden auf die Standardwerte zurückgesetzt."
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1762
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -1022,7 +1054,7 @@ msgstr ""
 "Sie sie nicht korrigieren:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1752
+#: rapid/preferencesdialog.py:1764
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -1033,17 +1065,17 @@ msgstr ""
 "ihn nicht korrigieren:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1753
+#: rapid/preferencesdialog.py:1765
 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:1934
+#: rapid/preferencesdialog.py:1949
 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:1936
+#: rapid/preferencesdialog.py:1951
 msgid "externaldrive2"
 msgstr "ExternesLaufwerk2"
 
@@ -1120,55 +1152,60 @@ msgid "Stockholm"
 msgstr "Stockholm"
 
 #. components
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:358
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
 msgstr "Unterordner"
 
-#: rapid/problemnotification.py:28 rapid/subfolderfile.py:356
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr "Dateiname"
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr "Die Werte für Datum und Uhrzeit %s scheinen ungültig zu sein."
 
-#: rapid/problemnotification.py:82
+#: rapid/problemnotification.py:86
 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:84
+#: rapid/problemnotification.py:88
 msgid "Filename does not have a number component."
 msgstr "Der Dateinamen enthält keine Zahlen."
 
-#: rapid/problemnotification.py:85
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr "Fehler beim Erstellen von %s."
 
 #. a generic problem
-#: rapid/problemnotification.py:87
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr "%(filetype)s Metadaten können nicht gelesen werden"
 
-#: rapid/problemnotification.py:89
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "%(filetype)s %(area)s können nicht erstellt werden"
 
-#: rapid/problemnotification.py:91 rapid/problemnotification.py:92
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr "Beim Kopieren von %(filetype)s ist ein Fehler aufgetreten"
 
-#: rapid/problemnotification.py:94 rapid/problemnotification.py:95
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr ""
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "%(filetype)s existiert bereits"
 
-#: rapid/problemnotification.py:98
+#: rapid/problemnotification.py:105
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1177,7 +1214,7 @@ msgstr ""
 "Von %(filetype)s konnte keine Sicherungskopie erstellt werden, da kein "
 "entsprechenden Verzeichnis gefunden wurde."
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:110
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -1186,12 +1223,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:104
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "%(filetype)s wurde bereits heruntergeladen"
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:115
 #, python-format
 msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
@@ -1200,29 +1237,35 @@ 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:109
+#: rapid/problemnotification.py:116
 #, 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:110
+#: rapid/problemnotification.py:117
 #, 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:112
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Fehler: %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:202
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr "Die Metadaten scheinen korrupt zu sein."
 
-#: rapid/problemnotification.py:205
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
@@ -1230,28 +1273,28 @@ msgstr ""
 "Dateiname, Erweiterung und EXIF-Informationen zeigen an, dass das Bild schon "
 "heruntergeladen wurde."
 
-#: rapid/problemnotification.py:224
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " Es wurde auf %(volume)s gesichert"
 
-#: rapid/problemnotification.py:226
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr " Es wurde auf diese Laufwerke gesichert: "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:229 rapid/problemnotification.py:290
-#: rapid/problemnotification.py:302
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s und %(final_volume)s."
 
-#: rapid/problemnotification.py:241
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
@@ -1260,269 +1303,320 @@ msgstr ""
 "Bilder mit identischen Dateinamen aber unterschiedlichen Aufnahmezeiten "
 "gefunden: %(details)s"
 
-#: rapid/problemnotification.py:258
+#: rapid/problemnotification.py:269
 #, 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:260
+#: rapid/problemnotification.py:271
 #, 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:262
+#: rapid/problemnotification.py:273
 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:266 rapid/problemnotification.py:314
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:268
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:272 rapid/problemnotification.py:316
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr "%(volumes)s und %(volume)s (%(inst)s)."
 
-#: rapid/problemnotification.py:277
+#: rapid/problemnotification.py:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s und %(volume)s."
 
-#: rapid/problemnotification.py:285
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "Sicherungskopie existiert bereits auf %(volume)s."
 
-#: rapid/problemnotification.py:287
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr "Sicherungskopien existieren bereits auf den folgenden Laufwerken: "
 
-#: rapid/problemnotification.py:297
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "Sicherungskopie überschrieben auf %(volume)s."
 
-#: rapid/problemnotification.py:299
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr "Sicherungskopien überschrieben auf den folgenden Laufwerken: "
 
-#: rapid/problemnotification.py:310
+#: rapid/problemnotification.py:321
 #, 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:312
+#: rapid/problemnotification.py:323
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 "Fehler beim Erstellen der Verzeichnisse auf den folgenden "
 "Sicherungslaufwerken: "
 
-#: rapid/problemnotification.py:323
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "%(previousproblem)s zusätzlich, %(newproblem)s"
 
-#: rapid/problemnotification.py:331
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " Zustätzlich sind folgende Probleme aufgetreten %(problems)s."
 
-#: rapid/problemnotification.py:333
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " Zustätzlich ist folgendes Problem aufgetreten %(problem)s."
 
-#: rapid/problemnotification.py:342
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Die %(type)s Metadaten fehlen."
 
-#: rapid/problemnotification.py:344
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr "Die folgenden Metadaten fehlen: "
 
-#: rapid/problemnotification.py:347
+#: rapid/problemnotification.py:371
 #, 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:364
+#: rapid/problemnotification.py:388
 msgid "Problems in subfolder and filename generation"
 msgstr "Probleme bei der Erstellung der Order und Dateinamen"
 
-#: rapid/problemnotification.py:366
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr "Problem bei der Erstellung der Order und Dateinamen"
 
-#: rapid/problemnotification.py:369
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Probleme bei der Erstellung von %s"
 
-#: rapid/problemnotification.py:371
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Problem bei der Erstellung von %s"
 
-#: rapid/problemnotification.py:380
+#: rapid/problemnotification.py:404
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr "%(filetype)s existiert bereits, wurde aber gesichert"
 
-#: rapid/problemnotification.py:382
+#: rapid/problemnotification.py:406
 #, 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:402
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr "Mehrere Probleme sind aufgetreten"
 
-#: rapid/problemnotification.py:404 rapid/subfolderfile.py:233
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 "Bilder mit gleichem Dateinamen aber unterschiedlichen Aufnahmezeiten gefunden"
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr "beim Erstellen der Sicherungskopieren sind Fehler aufgetreten"
 
-#: rapid/problemnotification.py:411
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr "Beim Erstellen der Sicherungskopieren sind Fehler aufgetreten"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr "beim Erstellen der Sicherungskopieren ist ein Fehler aufgetreten"
 
-#: rapid/problemnotification.py:414
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr "Beim Erstellen der Sicherungskopieren ist ein Fehler aufgetreten"
 
 #. e.g.
-#: rapid/problemnotification.py:417
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, und %(backinguperror)s"
 
-#: rapid/rpdfile.py:153
+#: rapid/rpdfile.py:159
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/rpdfile.py:163
+#: rapid/rpdfile.py:169
 #, python-format
 msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 msgstr "Suche läuft (%(photos)s Fotos und %(videos)s Videos gefunden) …"
 
-#: rapid/subfolderfile.py:80
+#: rapid/subfolderfile.py:81
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr "Unterordner und Dateiname"
+
+#: rapid/subfolderfile.py:406
 msgid "Photo has already been downloaded"
 msgstr "Das Bild wurde bereits heruntergeladen"
 
-#: rapid/subfolderfile.py:302
+#: rapid/subfolderfile.py:407
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Quelle: %(source)s"
 
-#: rapid/subfolderfile.py:354
-msgid "subfolder and filename"
-msgstr "Unterordner und Dateiname"
-
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:485
 msgid "Failed to create download subfolder"
 msgstr "Der Download-Unterordner konnte nicht erstellt werden"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:486
 #, python-format
 msgid "Path: %s"
 msgstr "Pfad: %s"
 
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr ""
+
 #: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
+msgstr "_Alle auswählen"
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "_Spenden Sie …"
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr "_Online Hilfe ..."
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr "_Problemmeldung"
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr "A_uswahl aufheben"
+
+#: rapid/glade3/rapid.ui.h:16
 msgid "_File"
 msgstr "_Datei"
 
-#: rapid/glade3/rapid.ui.h:3
+#: rapid/glade3/rapid.ui.h:17
 msgid "Download / Pause"
 msgstr "Download / Pause"
 
-#: rapid/glade3/rapid.ui.h:4
+#: rapid/glade3/rapid.ui.h:18
 msgid "_Select"
 msgstr "_Auswahl"
 
-#: rapid/glade3/rapid.ui.h:5
+#: rapid/glade3/rapid.ui.h:19
 msgid "Select All Without _Job Code"
 msgstr "Alle ohne Auftragsbezeichnung auswählen"
 
-#: rapid/glade3/rapid.ui.h:6
+#: rapid/glade3/rapid.ui.h:20
 msgid "Select All Wit_h Job Code"
 msgstr "Alle mit Auftragsbezeichnung auswählen"
 
-#: rapid/glade3/rapid.ui.h:7
+#: rapid/glade3/rapid.ui.h:21
 msgid "_View"
 msgstr "_Ansicht"
 
-#: rapid/glade3/rapid.ui.h:8
+#: rapid/glade3/rapid.ui.h:22
 msgid "_Error Log"
 msgstr "_Fehlerprotokoll"
 
-#: rapid/glade3/rapid.ui.h:9
+#: rapid/glade3/rapid.ui.h:23
 msgid "_Clear Completed Downloads"
 msgstr "_Heruntergeladene Dateien nicht mehr anzeigen"
 
-#: rapid/glade3/rapid.ui.h:10
+#: rapid/glade3/rapid.ui.h:24
 msgid "Previous File"
 msgstr "Vorherige Datei"
 
-#: rapid/glade3/rapid.ui.h:11
+#: rapid/glade3/rapid.ui.h:25
 msgid "Next File"
 msgstr "Nächste Datei"
 
-#: rapid/glade3/rapid.ui.h:12
+#: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: rapid/glade3/rapid.ui.h:13
-msgid "_Make a Donation..."
-msgstr "_Spenden Sie …"
-
-#: rapid/glade3/rapid.ui.h:14
+#: rapid/glade3/rapid.ui.h:27
 msgid "_Translate this Application..."
 msgstr "Diese Anwendung überse_tzen …"
 
-#: rapid/glade3/rapid.ui.h:15
-msgid "_Check All"
-msgstr "_Alle auswählen"
-
-#: rapid/glade3/rapid.ui.h:16
-msgid "_Uncheck All"
-msgstr "A_uswahl aufheben"
-
-#: rapid/glade3/rapid.ui.h:17
+#: rapid/glade3/rapid.ui.h:28
 msgid "_Include in download"
 msgstr "_Datei herunterladen"
 
-#: rapid/glade3/rapid.ui.h:18
+#: rapid/glade3/rapid.ui.h:29
 msgid "_Download"
 msgstr "_Herunterladen"
 
@@ -1844,7 +1938,7 @@ msgstr ""
 "werden, z.B. auf externe Laufwerke."
 
 #: rapid/glade3/prefs.ui.h:69
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr "Sicherungskopien während dem Herunterladen erstellen"
 
 #: rapid/glade3/prefs.ui.h:70
@@ -1887,8 +1981,8 @@ msgid "Video backup location:"
 msgstr "Sicherungsort für Filme"
 
 #: rapid/glade3/prefs.ui.h:79
-msgid "Backup"
-msgstr "Datensicherung"
+msgid "Back up"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:80
 msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
@@ -1923,35 +2017,39 @@ msgstr "Programm beenden auch wenn Fehler oder Warnungen aufgetreten sind"
 msgid "Automatically rotate JPEG images"
 msgstr "JPEG-Dateien automatisch rotieren"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:90
 msgid "Performance"
 msgstr "Geschwindigkeit"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:91
 msgid "Generate thumbnails (slower)"
 msgstr "Vorschaubilder erstellen (langsam)"
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:92
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Fehlerbehandlung</span>"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Namenskonflikte Bilder und Filme</b>"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Add unique identifier"
 msgstr "Füge eine eindeutige Information hinzu"
 
-#: rapid/glade3/prefs.ui.h:94
+#: rapid/glade3/prefs.ui.h:96
 msgid "Skip download"
 msgstr "Überspringe Download"
 
-#: rapid/glade3/prefs.ui.h:95
+#: rapid/glade3/prefs.ui.h:97
 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."
@@ -1960,7 +2058,7 @@ msgstr ""
 "heruntergeladen wurde, entweder Datei überspringen oder eine eindeutige "
 "Bezeichnung anfügen."
 
-#: rapid/glade3/prefs.ui.h:96
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1968,15 +2066,15 @@ msgstr ""
 "Bitte geben Sie an was geschehen soll, falls bei der Sicherung bereits eine "
 "Datei mit demselben Namen vorhanden ist, Überspringen oder Überschreiben."
 
-#: rapid/glade3/prefs.ui.h:97
+#: rapid/glade3/prefs.ui.h:99
 msgid "Overwrite"
 msgstr "Überschreibe"
 
-#: rapid/glade3/prefs.ui.h:98
+#: rapid/glade3/prefs.ui.h:100
 msgid "Skip"
 msgstr "Überspringen"
 
-#: rapid/glade3/prefs.ui.h:99
+#: rapid/glade3/prefs.ui.h:101
 msgid "Error Handling"
 msgstr "Fehlerbehandlung"
 
@@ -2246,6 +2344,9 @@ msgstr "Importieren Sie Ihre Bilder und Filme schnell und zuverlässig"
 #~ msgid "Automation"
 #~ msgstr "Automatisierung"
 
+#~ msgid "Backup"
+#~ msgstr "Datensicherung"
+
 #~ msgid "Backup folder name:"
 #~ msgstr "Verzeichnis für Datensicherung:"
 
@@ -2344,15 +2445,9 @@ msgstr "Importieren Sie Ihre Bilder und Filme schnell und zuverlässig"
 #~ msgid "Start downloading upon image device insertion"
 #~ msgstr "Beginn des Downloads beim Einfügen von Bilderlaufwerken"
 
-#~ msgid "_Report a Problem..."
-#~ msgstr "_Problemmeldung"
-
 #~ msgid "_Photos"
 #~ msgstr "_Fotos"
 
-#~ msgid "_Get Help Online..."
-#~ msgstr "_Online Hilfe ..."
-
 #~ msgid "_Thumbnails"
 #~ msgstr "_Vorschaubilder"
 
diff --git a/po/es.po b/po/es.po
index 862592d..8c14dac 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,23 +7,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-23 04:00-0500\n"
-"PO-Revision-Date: 2013-01-12 00:14+0000\n"
-"Last-Translator: Adolfo Jayme Barrientos <fitoschido@gmail.com>\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-23 03:30+0000\n"
+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-22 23:36+0000\n"
-"X-Generator: Launchpad (build 16430)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 "Language: es\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
-msgstr "Descargador rápido de fotos"
+msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -32,33 +32,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:119
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:122
+#: rapid/rapid.py:127
 #, 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:157
+#: rapid/rapid.py:162
 msgid "Device"
 msgstr "Dispositivo"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:175
+#: rapid/rapid.py:180
 msgid "Size"
 msgstr "Tamaño"
 
-#: rapid/rapid.py:178
+#: rapid/rapid.py:183
 msgid "Download Progress"
 msgstr "Progreso de la descarga"
 
-#: rapid/rapid.py:336
+#: rapid/rapid.py:343
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s no se desmontó"
@@ -67,22 +67,22 @@ msgstr "%(device)s no se desmontó"
 #. 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:1216
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr "analizando…"
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1782
+#: rapid/rapid.py:1818
 msgid "the root of the file system"
 msgstr "la raíz del sistema de archivos"
 
 #. message in dialog box which asks the user if they really want to be downloading from this location
-#: rapid/rapid.py:1786
+#: rapid/rapid.py:1822
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Descargando desde %(location)s."
 
-#: rapid/rapid.py:1787
+#: rapid/rapid.py:1823
 msgid ""
 "Do you really want to download from here? On some systems, scanning this "
 "location can take a very long time."
@@ -90,15 +90,15 @@ msgstr ""
 "¿Quiere realmente descargar desde aquí? En algunos sistemas, analizar esta "
 "ubicación puede tardar mucho tiempo."
 
-#: rapid/rapid.py:2209
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr "Descargar"
 
-#: rapid/rapid.py:2212
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr "Pausar"
 
-#: rapid/rapid.py:2317
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -109,7 +109,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2320
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -118,176 +118,189 @@ msgstr ""
 "Esta carpeta de descarga no es válida:\n"
 "%s"
 
-#: rapid/rapid.py:2321
+#: rapid/rapid.py:2380
 msgid "Download cannot proceed"
 msgstr "No se puede iniciar la descarga"
 
-#: rapid/rapid.py:2700
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+"Ningún dispositivo de respaldo contiene una carpeta válida para respaldar "
+"%(filetype)s"
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "fotos"
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "vídeos"
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr "Problema de respaldo"
+
+#: rapid/rapid.py:2802
 msgid "About 1 second remaining"
 msgstr "Queda aproximadamente 1 segundo"
 
-#: rapid/rapid.py:2702
+#: rapid/rapid.py:2804
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Quedan aproximadamente %i segundos"
 
-#: rapid/rapid.py:2704
+#: rapid/rapid.py:2806
 msgid "About 1 minute remaining"
 msgstr "Queda aproximadamente 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:2709
+#: rapid/rapid.py:2811
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Quedan aproximadamente %(minutes)i:%(seconds)02i minutos"
 
-#: rapid/rapid.py:2731 rapid/rpdfile.py:123
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
 msgid "photos and videos"
 msgstr "fotos y vídeos"
 
-#: rapid/rapid.py:2733 rapid/rpdfile.py:125
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
 msgid "photos or videos"
 msgstr "fotos o vídeos"
 
-#: rapid/rapid.py:2736 rapid/rapid.py:3558 rapid/rpdfile.py:128
-msgid "videos"
-msgstr "vídeos"
-
-#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
-#: rapid/rpdfile.py:291
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
 msgid "video"
 msgstr "vídeo"
 
-#: rapid/rapid.py:2741 rapid/rapid.py:3556 rapid/rpdfile.py:133
-msgid "photos"
-msgstr "fotos"
-
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2743 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
-#: rapid/rpdfile.py:272
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
 msgid "photo"
 msgstr "foto"
 
-#: rapid/rapid.py:2770
+#: rapid/rapid.py:2872
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s descargados"
 
-#: rapid/rapid.py:2774
+#: rapid/rapid.py:2876
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "No se pudieron descargar %(noFiles)s %(filetypes)s"
 
-#: rapid/rapid.py:2777 rapid/rapid.py:2829
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
 msgid "warnings"
 msgstr "avisos"
 
-#: rapid/rapid.py:2786
+#: rapid/rapid.py:2892
 msgid "All downloads complete"
 msgstr "Todas las descargas completadas"
 
-#: rapid/rapid.py:2792 rapid/rapid.py:2801 rapid/rapid.py:2810
-#: rapid/rapid.py:2819 rapid/rapid.py:2827
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2794 rapid/rapid.py:2812
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s descargados"
 
-#: rapid/rapid.py:2803 rapid/rapid.py:2821
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "No se pudieron descargar %(filetype)s"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2860
+#: rapid/rapid.py:2970
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr "%(number)s de %(total)s %(filetypes)s (%(remaining)s restantes)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:2977
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s de %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3222
+#: rapid/rapid.py:3331
 msgid "From"
 msgstr "Desde"
 
-#: rapid/rapid.py:3230
+#: rapid/rapid.py:3339
 msgid "Auto Detect"
 msgstr "Detectar automáticamente"
 
-#: rapid/rapid.py:3234 rapid/preferencesdialog.py:1327
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Elija un directorio que contenga %(file_types)s"
 
-#: rapid/rapid.py:3275
+#: rapid/rapid.py:3384
 msgid "Copy"
 msgstr "Copiar"
 
-#: rapid/rapid.py:3288
+#: rapid/rapid.py:3397
 msgid "Move"
 msgstr "Mover"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3419
 msgid "To"
 msgstr "A"
 
-#: rapid/rapid.py:3317 rapid/rapid.py:3986
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
 msgid "Photos:"
 msgstr "Fotos:"
 
-#: rapid/rapid.py:3320 rapid/preferencesdialog.py:1164
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
 msgid "Select a folder to download photos to"
 msgstr "Elija una carpeta donde descargar las fotos"
 
-#: rapid/rapid.py:3332 rapid/rapid.py:3986
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
 msgid "Videos:"
 msgstr "Vídeos:"
 
-#: rapid/rapid.py:3334 rapid/preferencesdialog.py:1182
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
 msgid "Select a folder to download videos to"
 msgstr "Elija una carpeta donde descargar los vídeos"
 
-#: rapid/rapid.py:3526
+#: rapid/rapid.py:3650
 msgid "and"
 msgstr "y"
 
-#: rapid/rapid.py:3531
+#: rapid/rapid.py:3655
 msgid "Using backup devices"
 msgstr "Usando dispositivos de copia de seguridad"
 
-#: rapid/rapid.py:3533
+#: rapid/rapid.py:3657
 msgid "Using backup device"
 msgstr "Usando dispositivo de copia de seguridad"
 
-#: rapid/rapid.py:3535
+#: rapid/rapid.py:3659
 msgid "No backup devices detected"
 msgstr "No se detectaron dispositivos de copia de seguridad"
 
-#: rapid/rapid.py:3562
+#: rapid/rapid.py:3686
 msgid "Free space:"
 msgstr "Espacio libre:"
 
 #. (videos) or (photos) will be appended to the free space message displayed to the
 #. user in the status bar.
 #. you should only translate this if your language does not use parantheses
-#: rapid/rapid.py:3574
+#: rapid/rapid.py:3698
 #, 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:3578
+#: rapid/rapid.py:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -295,87 +308,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:3583
+#: rapid/rapid.py:3707
 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:3588
+#: rapid/rapid.py:3712
 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:3594
+#: rapid/rapid.py:3718
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s disponible"
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3602
+#: rapid/rapid.py:3726
 #, python-format
 msgid "Backing up photos and videos to %(path)s"
 msgstr "Respaldando fotos y vídeos en %(path)s"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3605
+#: rapid/rapid.py:3729
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Respaldando en %(path)s"
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3608
+#: rapid/rapid.py:3732
 #, python-format
 msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr "Respaldando fotos en %(path)s y vídeos en %(path2)s"
 
-#: rapid/rapid.py:3615
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3644
+#: rapid/rapid.py:3768
 msgid "Program preferences are invalid"
 msgstr "Las preferencias del programa no son válidas"
 
-#: rapid/rapid.py:3770 rapid/rpdfile.py:273
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
 msgid "Photo"
 msgstr "Foto"
 
-#: rapid/rapid.py:3772 rapid/rpdfile.py:292
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "Vídeo"
 
-#: rapid/rapid.py:3781
+#: rapid/rapid.py:3921
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s directorio de descarga no existe"
 
-#: rapid/rapid.py:3783 rapid/rapid.py:3797 rapid/rapid.py:3810
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
 msgid "Folder: %s"
 msgstr "Carpeta: %s"
 
-#: rapid/rapid.py:3795
+#: rapid/rapid.py:3935
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s directorio de descarga es incorrecto"
 
-#: rapid/rapid.py:3808
+#: rapid/rapid.py:3948
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s imposible escribir en directorio de descarga"
 
-#: rapid/rapid.py:3894
+#: rapid/rapid.py:4034
 msgid "Thumbnails"
 msgstr "Miniaturas"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3949
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -384,23 +397,23 @@ msgstr ""
 "mostrar información del programa en la línea de órdenes mientras se ejecuta "
 "el programa (predet.: %default)"
 
-#: rapid/rapid.py:3950
+#: rapid/rapid.py:4090
 msgid "display debugging information when run from the command line"
 msgstr ""
 "mostrar información de depuración cuando se ejecute desde la línea de órdenes"
 
-#: rapid/rapid.py:3951
+#: rapid/rapid.py:4091
 msgid "only output errors to the command line"
-msgstr "solo errores de salida en la línea de comando"
+msgstr "solo errores de salida en la línea de órdenes"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3953
+#: rapid/rapid.py:4093
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 "listar las extensiones de archivo para fotos y vídeos que el programa "
 "reconoce y salir"
 
-#: rapid/rapid.py:3955
+#: rapid/rapid.py:4095
 msgid ""
 "automatically detect devices from which to download, overwriting existing "
 "program preferences"
@@ -408,7 +421,7 @@ msgstr ""
 "detectar automáticamente los dispositivos de los cuales descargarr, "
 "sobreescribiendo las preferencias existentes del programa"
 
-#: rapid/rapid.py:3956
+#: rapid/rapid.py:4096
 msgid ""
 "manually specify the PATH of the device from which to download, overwriting "
 "existing program preferences"
@@ -416,12 +429,12 @@ msgstr ""
 "especificar manualmente de que dispositivos descargar, sobreescribiendo las "
 "preferencias existentes del programa"
 
-#: rapid/rapid.py:3957
+#: rapid/rapid.py:4097
 msgid "reset all program settings and preferences and exit"
 msgstr ""
 "Restablecer todas las configuraciones y preferencias del programa y salir"
 
-#: rapid/rapid.py:3970
+#: rapid/rapid.py:4110
 msgid ""
 "Error: specify device auto-detection or manually specify a device's path "
 "from which to download, but do not do both."
@@ -429,25 +442,26 @@ msgstr ""
 "Error: especificar autodeteccion del dispositivo o eleccion manual de "
 "dispositivo desde donde descargar, pero no ambas."
 
-#: rapid/rapid.py:3991
+#: rapid/rapid.py:4133
 #, python-format
 msgid "and %s"
 msgstr "y %s"
 
-#: rapid/rapid.py:3999
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
 msgstr "Todas las opciones y preferencias se han reestablecido"
 
-#: rapid/backupfile.py:157 rapid/backupfile.py:180
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
 msgid "Backing up error"
 msgstr "Error en copia de seguridad"
 
-#: rapid/backupfile.py:159
+#: rapid/backupfile.py:151
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "El directorio de destino no puede ser creado: %(directory)s\n"
 
-#: rapid/backupfile.py:161 rapid/backupfile.py:182 rapid/subfolderfile.py:199
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -456,13 +470,29 @@ msgstr ""
 "Origen: %(source)s\n"
 "Destino: %(destination)s"
 
-#: rapid/backupfile.py:164 rapid/backupfile.py:184
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Error: %(inst)s"
 
-#: rapid/copyfiles.py:163 rapid/subfolderfile.py:214
-#: rapid/subfolderfile.py:347 rapid/subfolderfile.py:365
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr "%(file_type)s sin respaldar"
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr "Ya existe un respaldo de %(file_type)s"
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -471,6 +501,10 @@ msgstr ""
 "%(problem)s\n"
 "Archivo: %(file)s"
 
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr "Ocurrió un error desconocido"
+
 #: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Dispositivo detectado"
@@ -658,7 +692,7 @@ msgstr "Autor"
 
 #: rapid/generatenameconfig.py:207
 msgid "Copyright"
-msgstr "Derechos de autor"
+msgstr "Copyright"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
 #: rapid/generatenameconfig.py:209
@@ -945,32 +979,33 @@ msgstr "Código de trabajo:"
 
 #: rapid/preferencesdialog.py:822
 msgid "Enter a Path to Ignore"
-msgstr "Introduce una ruta a ignorar"
+msgstr "Escriba una ruta para ignorar"
 
 #: rapid/preferencesdialog.py:834
 msgid "Specify a path that will never be scanned for photos or videos"
-msgstr "Especifica una ruta que nunca será escaneada para fotos o vídeos"
+msgstr ""
+"Especifique una ruta que nunca se escaneará en busca de fotos o vídeos"
 
 #: rapid/preferencesdialog.py:839
 msgid "Path:"
 msgstr "Ruta:"
 
-#: rapid/preferencesdialog.py:1082
+#: rapid/preferencesdialog.py:1092
 msgid "Job Code"
 msgstr "Código de trabajo"
 
-#: rapid/preferencesdialog.py:1353
+#: rapid/preferencesdialog.py:1363
 msgid "Select a folder in which to backup photos"
 msgstr ""
 "Seleccione una carpeta en la que se hará una copia de seguridad de las fotos"
 
-#: rapid/preferencesdialog.py:1366
+#: rapid/preferencesdialog.py:1376
 msgid "Select a folder in which to backup videos"
 msgstr ""
 "Seleccione una carpeta en la que se hará una copia de seguridad de los vídeos"
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/preferencesdialog.py:1461
+#: rapid/preferencesdialog.py:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -978,7 +1013,7 @@ msgstr ""
 "<i><b>Atencion:</b> No hay suficientes datos para generar el nombre "
 "completo. Por favor utilice otras opciones para renombrar.</i>"
 
-#: rapid/preferencesdialog.py:1512
+#: rapid/preferencesdialog.py:1524
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -987,13 +1022,13 @@ msgstr ""
 "Por favor utilice otro nombre para el subdirectorio.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/preferencesdialog.py:1515
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Ejemplo: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1605
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -1004,7 +1039,7 @@ msgstr ""
 "pueden ser utilizadas.\n"
 "Se ajustaran a los valores por defecto"
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1762
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -1015,7 +1050,7 @@ msgstr ""
 "las corrija:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1752
+#: rapid/preferencesdialog.py:1764
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -1026,17 +1061,17 @@ msgstr ""
 "correcta:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1753
+#: rapid/preferencesdialog.py:1765
 msgid "Invalid regular expression"
 msgstr "Expresión regular inválida"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1934
+#: rapid/preferencesdialog.py:1949
 msgid "externaldrive1"
 msgstr "dispositivoexterno1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1936
+#: rapid/preferencesdialog.py:1951
 msgid "externaldrive2"
 msgstr "dispositivoexterno2"
 
@@ -1102,7 +1137,7 @@ msgstr "Varsovia"
 
 #: rapid/prefsrapid.py:131
 msgid "Jakarta"
-msgstr "Jakarta"
+msgstr "Yakarta"
 
 #: rapid/prefsrapid.py:131
 msgid "Madrid"
@@ -1113,55 +1148,60 @@ msgid "Stockholm"
 msgstr "Estocolmo"
 
 #. components
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:358
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
 msgstr "subdirectorio"
 
-#: rapid/problemnotification.py:28 rapid/subfolderfile.py:356
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr "nombre de archivo"
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr "Fecha y hora %s parecen incorrectos."
 
-#: rapid/problemnotification.py:82
+#: rapid/problemnotification.py:86
 msgid "Filename does not have an extension."
 msgstr "El nombre del archivo no tiene extension."
 
 #. a number component is something like the 8346 in IMG_8346.JPG
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:88
 msgid "Filename does not have a number component."
 msgstr "El nombre del archivo no tiene componentes numericos."
 
-#: rapid/problemnotification.py:85
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr "Error generando componente %s."
 
 #. a generic problem
-#: rapid/problemnotification.py:87
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr "%(filetype)s no se pueden leer los metadatos"
 
-#: rapid/problemnotification.py:89
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "%(filetype)s %(area)s no se pueden generar"
 
-#: rapid/problemnotification.py:91 rapid/problemnotification.py:92
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr "Ocurrió un error al copiar el/los %(filetype)s"
 
-#: rapid/problemnotification.py:94 rapid/problemnotification.py:95
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr ""
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "%(filetype)s ya existe"
 
-#: rapid/problemnotification.py:98
+#: rapid/problemnotification.py:105
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1170,7 +1210,7 @@ msgstr ""
 "%(filetype)s no se hizo copia de seguridad por que no se encontro una "
 "ubicacion donde realizarla."
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:110
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -1179,12 +1219,12 @@ msgstr ""
 "%(image1)s fue tomada en %(image1_date)s en %(image1_time)s, y %(image2)s en "
 "%(image2_date)s en %(image2_time)s."
 
-#: rapid/problemnotification.py:104
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "%(filetype)s ya estan descargadas"
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:115
 #, python-format
 msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
@@ -1193,28 +1233,36 @@ msgstr ""
 "El existente %(filetype)s fue modificado por ultima vez el %(date)s a las "
 "%(time)s. identificador único '%(identifier)s' añadido."
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:116
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 "El existente %(filetype)s fue modificado por ultima vez el %(date)s a las "
 "%(time)s."
 
-#: rapid/problemnotification.py:110
+#: rapid/problemnotification.py:117
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr "No hay datos que coincidan con el nombre del %(filetype)s."
 
-#: rapid/problemnotification.py:112
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Error: %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:202
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+"Falló la comprobación de archivos. La versión descargada difiere de la "
+"original."
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr "Los metadatos parecen corruptos."
 
-#: rapid/problemnotification.py:205
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
@@ -1222,29 +1270,29 @@ msgstr ""
 "El nombre de fichero, extensión y la información Exif indican que ya ha sido "
 "descargado."
 
-#: rapid/problemnotification.py:224
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " Fue realizada una copia de seguridad de los datos en %(volume)s"
 
-#: rapid/problemnotification.py:226
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr ""
 " Fue realizada una copia de seguridad de los datos en este dispositivo "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:229 rapid/problemnotification.py:290
-#: rapid/problemnotification.py:302
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s y %(final_volume)s."
 
-#: rapid/problemnotification.py:241
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
@@ -1253,266 +1301,319 @@ msgstr ""
 "Detectadas fotos con el mismo nombre, pero distinta fecha de realizacion: "
 "%(details)s"
 
-#: rapid/problemnotification.py:258
+#: rapid/problemnotification.py:269
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr ""
 "Ocurrio un error durante la realizacion de la copia de seguridad en "
 "%(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:260
+#: rapid/problemnotification.py:271
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr "Ocurrio un error al realizar la copia de seguridad en %(volume)s."
 
-#: rapid/problemnotification.py:262
+#: rapid/problemnotification.py:273
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr ""
 "Ocurrió un error durante la realización de la copia de seguridad en el "
 "dispositivo: "
 
-#: rapid/problemnotification.py:266 rapid/problemnotification.py:314
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:268
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:272 rapid/problemnotification.py:316
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr "%(volumes)s y %(volume)s (%(inst)s)."
 
-#: rapid/problemnotification.py:277
+#: rapid/problemnotification.py:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s y %(volume)s."
 
-#: rapid/problemnotification.py:285
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "La copia de seguridad ya existe en %(volume)s."
 
-#: rapid/problemnotification.py:287
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr "Las copias de seguridad estan en este directorio: "
 
-#: rapid/problemnotification.py:297
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "Sobreescrita copia de seguridad en %(volume)s."
 
-#: rapid/problemnotification.py:299
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr "Sobreescritas copias de seguridad en estos dispositivos: "
 
-#: rapid/problemnotification.py:310
+#: rapid/problemnotification.py:321
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr "Ocurrió un error al crear los directorios en %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:312
+#: rapid/problemnotification.py:323
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 "Ocurrió un error al crear los directorios en los dispositivos de copia de "
 "seguridad: "
 
-#: rapid/problemnotification.py:323
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+"Falló la comprobación de archivos en %(volume)s. La versión respaldada "
+"difiere de la descargada."
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr "Falló la comprobación de archivos en estos dispositivos: "
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "%(previousproblem)s Adicionalmente, %(newproblem)s"
 
-#: rapid/problemnotification.py:331
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " Además, se encontrarón %(problems)s"
 
-#: rapid/problemnotification.py:333
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " Además, se encontro %(problem)s."
 
-#: rapid/problemnotification.py:342
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Los %(type)s metadatos no estan."
 
-#: rapid/problemnotification.py:344
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr "Los siguientes metadatos faltan: "
 
-#: rapid/problemnotification.py:347
+#: rapid/problemnotification.py:371
 #, python-format
 msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr "%(missing_metadata_elements)s y %(final_missing_metadata_element)s."
 
-#: rapid/problemnotification.py:364
+#: rapid/problemnotification.py:388
 msgid "Problems in subfolder and filename generation"
 msgstr "Problemas al crear subdirectorio y nombre de archivo"
 
-#: rapid/problemnotification.py:366
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr "Problema al crear subdirectorio y nombre de archivo"
 
-#: rapid/problemnotification.py:369
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Problemas al %s crear"
 
-#: rapid/problemnotification.py:371
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Problema al %s crear"
 
-#: rapid/problemnotification.py:380
+#: rapid/problemnotification.py:404
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr "%(filetype)s ya existen, pero fue realizada copia de seguridad"
 
-#: rapid/problemnotification.py:382
+#: rapid/problemnotification.py:406
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 "Un error ocurrió al copiar los %(filetype)s, pero fue realizada una copia de "
 "seguridad"
 
-#: rapid/problemnotification.py:402
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr "Varios problemas fueron encontrados"
 
-#: rapid/problemnotification.py:404 rapid/subfolderfile.py:233
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 "Fotos detectadas con el mismo nombre de archivo, pero tomadas a distinta hora"
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr "Hubo varios errores al realizar la copia de seguridad"
 
-#: rapid/problemnotification.py:411
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr "Hubo varios errores al realizar la copia de seguridad"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr "Hubo un error al realizar la copia de seguridad"
 
-#: rapid/problemnotification.py:414
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr "Hubo un error al realizar la copia de seguridad"
 
 #. e.g.
-#: rapid/problemnotification.py:417
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, y %(backinguperror)s"
 
-#: rapid/rpdfile.py:153
+#: rapid/rpdfile.py:159
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/rpdfile.py:163
+#: rapid/rpdfile.py:169
 #, python-format
 msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 msgstr "analizando (se encontraron %(photos)s fotos y %(videos)s vídeos)…"
 
-#: rapid/subfolderfile.py:80
+#: rapid/subfolderfile.py:81
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr "Subdirectorio y nombre de archivo"
+
+#: rapid/subfolderfile.py:406
 msgid "Photo has already been downloaded"
 msgstr "La fotografia ya ha sido descargada"
 
-#: rapid/subfolderfile.py:302
+#: rapid/subfolderfile.py:407
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Origen: %(source)s"
 
-#: rapid/subfolderfile.py:354
-msgid "subfolder and filename"
-msgstr "Subdirectorio y nombre de archivo"
-
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:485
 msgid "Failed to create download subfolder"
 msgstr "Fallo al crear carpeta para descargas"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:486
 #, python-format
 msgid "Path: %s"
 msgstr "Ruta: %s"
 
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr "Acerca de..."
+
 #: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
+msgstr "_Seleccionar todo"
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr "Seleccionar todas las fotos"
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr "Seleccionar todos los vídeos"
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "_Hacer una donación"
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr "_Conseguir ayuda online"
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr "Ayuda"
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
+msgstr "Salir"
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
+msgstr "Actualizar"
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr "_Reportar problema..."
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
+msgstr "Traducir esta aplicación..."
+
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr "_Deseleccionar todo"
+
+#: rapid/glade3/rapid.ui.h:16
 msgid "_File"
 msgstr "_Archivo"
 
-#: rapid/glade3/rapid.ui.h:3
+#: rapid/glade3/rapid.ui.h:17
 msgid "Download / Pause"
 msgstr "Descarga/Pausa"
 
-#: rapid/glade3/rapid.ui.h:4
+#: rapid/glade3/rapid.ui.h:18
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: rapid/glade3/rapid.ui.h:5
+#: rapid/glade3/rapid.ui.h:19
 msgid "Select All Without _Job Code"
 msgstr "Seleccionar todo sin codigo de trabajo"
 
-#: rapid/glade3/rapid.ui.h:6
+#: rapid/glade3/rapid.ui.h:20
 msgid "Select All Wit_h Job Code"
 msgstr "Seleccionar todo con codigo de trabajo Wit_h"
 
-#: rapid/glade3/rapid.ui.h:7
+#: rapid/glade3/rapid.ui.h:21
 msgid "_View"
 msgstr "_Ver"
 
-#: rapid/glade3/rapid.ui.h:8
+#: rapid/glade3/rapid.ui.h:22
 msgid "_Error Log"
 msgstr "_Registro de errores"
 
-#: rapid/glade3/rapid.ui.h:9
+#: rapid/glade3/rapid.ui.h:23
 msgid "_Clear Completed Downloads"
 msgstr "_Limpiar descargas completadas"
 
-#: rapid/glade3/rapid.ui.h:10
+#: rapid/glade3/rapid.ui.h:24
 msgid "Previous File"
 msgstr "Archivo anterior"
 
-#: rapid/glade3/rapid.ui.h:11
+#: rapid/glade3/rapid.ui.h:25
 msgid "Next File"
 msgstr "Archivo siguiente"
 
-#: rapid/glade3/rapid.ui.h:12
+#: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: rapid/glade3/rapid.ui.h:13
-msgid "_Make a Donation..."
-msgstr "_Hacer una donación"
-
-#: rapid/glade3/rapid.ui.h:14
+#: rapid/glade3/rapid.ui.h:27
 msgid "_Translate this Application..."
 msgstr "_Traducir esta aplicación…"
 
-#: rapid/glade3/rapid.ui.h:15
-msgid "_Check All"
-msgstr "_Seleccionar todo"
-
-#: rapid/glade3/rapid.ui.h:16
-msgid "_Uncheck All"
-msgstr "_Deseleccionar todo"
-
-#: rapid/glade3/rapid.ui.h:17
+#: rapid/glade3/rapid.ui.h:28
 msgid "_Include in download"
 msgstr "_Incluido en la descarga"
 
-#: rapid/glade3/rapid.ui.h:18
+#: rapid/glade3/rapid.ui.h:29
 msgid "_Download"
 msgstr "_Descarga"
 
@@ -1838,8 +1939,8 @@ msgstr ""
 "lugares, una vez descargados, por ejemplo, discos duros externos."
 
 #: rapid/glade3/prefs.ui.h:69
-msgid "Backup photos and videos when downloading"
-msgstr "Realizar copia de seguridad al descargar fotografias y videos"
+msgid "Back up photos and videos when downloading"
+msgstr "Realizar copia de seguridad al descargar fotos y vídeos"
 
 #: rapid/glade3/prefs.ui.h:70
 msgid ""
@@ -1882,8 +1983,8 @@ msgid "Video backup location:"
 msgstr "Ubicacion de la copia de seguridad de videos:"
 
 #: rapid/glade3/prefs.ui.h:79
-msgid "Backup"
-msgstr "Copia de seguridad"
+msgid "Back up"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:80
 msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
@@ -1918,35 +2019,39 @@ msgstr ""
 msgid "Automatically rotate JPEG images"
 msgstr "Rotar automáticamente las imágenes JPEG"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr "Comprobar archivos a medida que se descargan"
+
+#: rapid/glade3/prefs.ui.h:90
 msgid "Performance"
 msgstr "Prestaciones"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:91
 msgid "Generate thumbnails (slower)"
 msgstr "Generar miniaturas (lento)"
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:92
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Manejo de errores</span>"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Problemas con el nombre de Fotografiay Video</b>"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Add unique identifier"
 msgstr "Agregar identificador único"
 
-#: rapid/glade3/prefs.ui.h:94
+#: rapid/glade3/prefs.ui.h:96
 msgid "Skip download"
 msgstr "Saltar descarga"
 
-#: rapid/glade3/prefs.ui.h:95
+#: rapid/glade3/prefs.ui.h:97
 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."
@@ -1954,7 +2059,7 @@ msgstr ""
 "Cuando una fotografía o video ha sido ya descargada, elegir omitirla "
 "descarga del archivo o añadir un identificador único."
 
-#: rapid/glade3/prefs.ui.h:96
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1963,15 +2068,15 @@ msgstr ""
 "dispositivo de copia de seguridad que tenga el mismo nombre, o salte hacer "
 "respaldo."
 
-#: rapid/glade3/prefs.ui.h:97
+#: rapid/glade3/prefs.ui.h:99
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: rapid/glade3/prefs.ui.h:98
+#: rapid/glade3/prefs.ui.h:100
 msgid "Skip"
 msgstr "Saltar"
 
-#: rapid/glade3/prefs.ui.h:99
+#: rapid/glade3/prefs.ui.h:101
 msgid "Error Handling"
 msgstr "Manejo de errores"
 
@@ -2066,9 +2171,6 @@ msgstr "Descargue sus fotografías y vídeos de forma eficaz y segura"
 #~ msgid "_Photos"
 #~ msgstr "_Fotos"
 
-#~ msgid "_Get Help Online..."
-#~ msgstr "_Conseguir ayuda online"
-
 #~ msgid "_Thumbnails"
 #~ msgstr "_Miniaturas"
 
@@ -2625,12 +2727,12 @@ msgstr "Descargue sus fotografías y vídeos de forma eficaz y segura"
 #~ msgid "Image filename could not be generated"
 #~ msgstr "No se pudo generar el nombre del archivo de imagen"
 
-#~ msgid "_Report a Problem..."
-#~ msgstr "_Reportar problema..."
-
 #~ msgid ""
 #~ "You can have your photos backed up to multiple locations as they are "
 #~ "downloaded, e.g. external hard drives."
 #~ msgstr ""
 #~ "Puede tener respaldos de sus fotos en múltiples ubicaciones, por ejemplo: "
 #~ "discos duros externos."
+
+#~ msgid "Backup"
+#~ msgstr "Copia de seguridad"
diff --git a/po/et.po b/po/et.po
index 4dc0989..d41ea19 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1728,7 +1728,7 @@ msgid ""
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:69
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:70
diff --git a/po/fa.po b/po/fa.po
index 1eb413e..b752dd1 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,1776 +7,1825 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-13 19:03+0500\n"
-"PO-Revision-Date: 2010-08-06 21:46+0000\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:14+0000\n"
 "Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 14:32+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:124 rapid/rapid.py:6299 rapid/glade3/rapid.glade.h:71
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: rapid/rapid.py:456
-msgid "New York"
-msgstr "نیویورک"
-
-#: rapid/rapid.py:457
-msgid "Manila"
-msgstr "مانیل"
-
-#: rapid/rapid.py:457
-msgid "Prague"
-msgstr "پراگ"
-
-#: rapid/rapid.py:457
-msgid "Helsinki"
-msgstr "هلسینکی"
-
-#: rapid/rapid.py:457
-msgid "Wellington"
-msgstr "ولینگتون"
-
-#: rapid/rapid.py:458
-msgid "Tehran"
-msgstr "تهران"
-
-#: rapid/rapid.py:458
-msgid "Kampala"
-msgstr "کامپلا"
-
-#: rapid/rapid.py:458
-msgid "Paris"
-msgstr "پاریس"
-
-#: rapid/rapid.py:458
-msgid "Berlin"
-msgstr "برلین"
-
-#: rapid/rapid.py:458
-msgid "Sydney"
-msgstr "سیدنی"
-
-#: rapid/rapid.py:459
-msgid "Budapest"
-msgstr "بوداپست"
-
-#: rapid/rapid.py:459
-msgid "Rome"
-msgstr "رم"
-
-#: rapid/rapid.py:459
-msgid "Moscow"
-msgstr "مسکو"
-
-#: rapid/rapid.py:459
-msgid "Delhi"
-msgstr "دهلی"
-
-#: rapid/rapid.py:459
-msgid "Warsaw"
-msgstr "ورشو"
-
-#: rapid/rapid.py:460
-msgid "Jakarta"
-msgstr "جاکارتا"
-
-#: rapid/rapid.py:460
-msgid "Madrid"
-msgstr "مادرید"
-
-#: rapid/rapid.py:460
-msgid "Stockholm"
-msgstr "استکهلم"
-
-#: rapid/rapid.py:493
-msgid "Invalid Downloads Today value.\n"
-msgstr ""
-
-#: rapid/rapid.py:494
-msgid "Resetting value to zero.\n"
-msgstr "ری ست مقدار به صفر\n"
-
-#: rapid/rapid.py:533
-msgid "'Start of day' preference value is corrupted.\n"
-msgstr ""
-
-#: rapid/rapid.py:534
-msgid "Resetting to midnight.\n"
-msgstr ""
-
-#: rapid/rapid.py:560
-msgid "Error in Photo Rename preferences"
+#: rapid/rapid.py:122
+#, python-format
+msgid ""
+"%(date)s\n"
+"%(time)s"
 msgstr ""
 
-#: rapid/rapid.py:591 rapid/rapid.py:1710
-msgid "Sorry,these preferences contain an error:\n"
+#: rapid/rapid.py:124
+#, python-format
+msgid "%(date)s %(time)s"
 msgstr ""
 
-#: rapid/rapid.py:602
-msgid "Resetting to default values."
-msgstr "مقدار دهی ثانویه مقادیر اولیه"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:677 rapid/renamesubfolderprefs.py:198
-msgid "Job code"
-msgstr "کد دستور"
-
-#: rapid/rapid.py:745
-msgid "Error in Video Rename preferences"
+#: rapid/rapid.py:127
+#, python-format
+msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr ""
 
-#: rapid/rapid.py:763
-msgid "Error in Photo Download Subfolders preferences"
+#. Device refers to a thing like a camera, memory card in its reader,
+#. external hard drive, Portable Storage Device, etc.
+#: rapid/rapid.py:162
+msgid "Device"
 msgstr ""
 
-#: rapid/rapid.py:780
-msgid "Error in Video Download Subfolders preferences"
+#. Size refers to the total size of images on the device, typically in
+#. MB or GB
+#: rapid/rapid.py:180
+msgid "Size"
 msgstr ""
 
-#: rapid/rapid.py:813 rapid/rapid.py:1544
-msgid "photos and videos"
+#: rapid/rapid.py:183
+msgid "Download Progress"
 msgstr ""
 
-#: rapid/rapid.py:815 rapid/rapid.py:1554 rapid/rapid.py:1679
-msgid "photos"
+#: rapid/rapid.py:343
+#, python-format
+msgid "%(device)s did not unmount"
 msgstr ""
 
-#: rapid/rapid.py:948
-msgid "Select a folder to download photos to"
-msgstr "یک پوشه را برای دانلود عکس انتخاب نمایید"
+#. This refers to when a device like a hard drive is having its contents scanned,
+#. looking for photos or videos. It is visible initially in the progress bar for each device
+#. (which normally holds "x photos and videos").
+#. It maybe displayed only briefly if the contents of the device being scanned is small.
+#: rapid/rapid.py:1241
+msgid "scanning..."
+msgstr "در حال پویش..."
 
-#: rapid/rapid.py:966
-msgid "Select a folder to download videos to"
+#. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
+#: rapid/rapid.py:1818
+msgid "the root of the file system"
 msgstr ""
 
-#: rapid/rapid.py:1048
+#. message in dialog box which asks the user if they really want to be downloading from this location
+#: rapid/rapid.py:1822
 #, python-format
-msgid "Select a folder containing %(file_types)s"
+msgid "Downloading from %(location)s."
 msgstr ""
 
-#: rapid/rapid.py:1070
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
+#: rapid/rapid.py:1823
+msgid ""
+"Do you really want to download from here? On some systems, scanning this "
+"location can take a very long time."
 msgstr ""
 
-#. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:1151
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
-"name. Please use other renaming options.</i>"
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
+msgid "Download"
 msgstr ""
 
-#: rapid/rapid.py:1187
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate "
-"subfolders. Please use other subfolder naming options.</i>"
+#: rapid/rapid.py:2270
+msgid "Pause"
 msgstr ""
 
-#. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:1191
+#: rapid/rapid.py:2376
 #, python-format
-msgid "<i>Example: %s</i>"
-msgstr "<i>مثال : %s</i>"
-
-#: rapid/rapid.py:1217
 msgid ""
-"Downloads today value not updated, as a download is currently occurring"
-msgstr ""
-
-#: rapid/rapid.py:1233
-msgid "Stored number value not updated, as a download is currently occurring"
+"These download folders are invalid:\n"
+"%(folder1)s\n"
+"%(folder2)s"
 msgstr ""
-"مقدار عدد ذخیره شده قابل به روز رسانی نمی باشد زیرا در حال حاضر یک دانلود در "
-"حال انجام است."
 
-#: rapid/rapid.py:1263
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
-"The %(filetype)s subfolder preferences had some unnecessary values removed."
+"This download folder is invalid:\n"
+"%s"
 msgstr ""
 
-#. Preferences list is now empty
-#: rapid/rapid.py:1268
+#: rapid/rapid.py:2380
+msgid "Download cannot proceed"
+msgstr "دانلود نمی تواند ادامه پیدا کند..."
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
 #, python-format
-msgid ""
-"The %(filetype)s subfolder preferences entered are invalid and cannot be "
-"used.\n"
-"They will be reset to their default values."
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
 msgstr ""
 
-#. check subfolder preferences for bad values
-#: rapid/rapid.py:1282 rapid/rapid.py:1556
-msgid "photo"
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
 msgstr ""
 
-#: rapid/rapid.py:1283 rapid/rapid.py:1551
-msgid "video"
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
 msgstr ""
 
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1520
-msgid "externaldrive1"
-msgstr "درایو خارجی 1"
-
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1522
-msgid "externaldrive2"
-msgstr "درایو خارجی 2"
-
-#: rapid/rapid.py:1546 rapid/rapid.py:1677
-msgid "photos or videos"
+#: rapid/rapid.py:2393
+msgid "Backup problem"
 msgstr ""
 
-#: rapid/rapid.py:1549
-msgid "videos"
+#: rapid/rapid.py:2802
+msgid "About 1 second remaining"
 msgstr ""
 
-#: rapid/rapid.py:1561
+#: rapid/rapid.py:2804
 #, python-format
-msgid ""
-"%(date)s\n"
-"%(time)s"
+msgid "About %i seconds remaining"
 msgstr ""
 
-#: rapid/rapid.py:1563
-#, python-format
-msgid "%(date)s %(time)s"
+#: rapid/rapid.py:2806
+msgid "About 1 minute remaining"
 msgstr ""
 
-#: rapid/rapid.py:1566
+#. 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:2811
 #, python-format
-msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr ""
 
-#: rapid/rapid.py:1573
-#, python-format
-msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
+msgid "photos and videos"
 msgstr ""
 
-#: rapid/rapid.py:1601 rapid/rapid.py:2267
-msgid "subfolder and filename"
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
+msgid "photos or videos"
 msgstr ""
 
-#: rapid/rapid.py:1603 rapid/rapid.py:2269
-msgid "filename"
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
+msgid "video"
 msgstr ""
 
-#: rapid/rapid.py:1605 rapid/rapid.py:2271
-msgid "subfolder"
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
+msgid "photo"
 msgstr ""
 
-#. This refers to when a device like a hard drive is having its contents scanned,
-#. looking for photos or videos. It is visible initially in the progress bar for each device
-#. (which normally holds "x photos and videos").
-#. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1693
-msgid "scanning..."
-msgstr "در حال پویش..."
-
-#: rapid/rapid.py:1804
-msgid "The following download path could not be created:\n"
+#: rapid/rapid.py:2872
+#, python-format
+msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:1805
+#: rapid/rapid.py:2876
 #, python-format
-msgid "%(path)s: "
+msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: rapid/rapid.py:1806 rapid/rapid.py:1807 rapid/rapid.py:1822
-#: rapid/rapid.py:1823 rapid/rapid.py:2084 rapid/rapid.py:2087
-msgid "Download cannot proceed"
-msgstr "دانلود نمی تواند ادامه پیدا کند..."
-
-#: rapid/rapid.py:1820 rapid/rapid.py:4959
-msgid "There is an error in the program preferences."
-msgstr "خطا در تنظیمات برنامه وجود دارد."
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
+msgid "warnings"
+msgstr ""
 
-#: rapid/rapid.py:1821
-msgid ""
-"\n"
-"Please check preferences, restart the program, and try again."
+#: rapid/rapid.py:2892
+msgid "All downloads complete"
 msgstr ""
-"\n"
-"لطفا تنظیمات چک کنید ، برنامه را مجدد راه اندازی ، و دوباره سعی کنید."
 
-#. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-#. It refers to the actual number of photos that can be copied. For example, the user might see the following:
-#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
-#. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:1995
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
-msgid "%(number)s %(filetypes)s"
+msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
-#. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-#. to the user when they run the program, signifying the number of photos found, and the device they were found on.
-#. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
-#. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
-#. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:2006
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
-msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
+msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2013
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
-msgid "Device scan complete: no %(filetypes)s found on %(device)s"
+msgid "%(filetype)s failed to download"
 msgstr ""
 
-#. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:2034
-msgid "The device can now be safely removed"
+#. e.g.: 3 of 205 photos and videos (202 remaining)
+#: rapid/rapid.py:2970
+#, python-format
+msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr ""
 
-#: rapid/rapid.py:2040
+#. e.g.: 205 of 205 photos and videos
+#: rapid/rapid.py:2977
 #, python-format
-msgid "%(noFiles)s %(filetypes)s downloaded"
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr ""
+
+#: rapid/rapid.py:3331
+msgid "From"
 msgstr ""
 
-#: rapid/rapid.py:2043
+#: rapid/rapid.py:3339
+msgid "Auto Detect"
+msgstr ""
+
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
-msgid "%(noFiles)s %(filetypes)s failed to download"
+msgid "Select a folder containing %(file_types)s"
 msgstr ""
 
-#: rapid/rapid.py:2046 rapid/rapid.py:5744
-msgid "warnings"
+#: rapid/rapid.py:3384
+msgid "Copy"
 msgstr ""
 
-#: rapid/rapid.py:2048 rapid/rapid.py:5748
-msgid "errors"
+#: rapid/rapid.py:3397
+msgid "Move"
 msgstr ""
 
-#: rapid/rapid.py:2078
-#, python-format
-msgid "Source: %s\n"
+#: rapid/rapid.py:3419
+msgid "To"
 msgstr ""
 
-#: rapid/rapid.py:2080
-#, python-format
-msgid "Device: %s\n"
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
+msgid "Photos:"
 msgstr ""
 
-#: rapid/rapid.py:2081
-#, python-format
-msgid "Destination: %s"
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
+msgid "Select a folder to download photos to"
+msgstr "یک پوشه را برای دانلود عکس انتخاب نمایید"
+
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
+msgid "Videos:"
 msgstr ""
 
-#: rapid/rapid.py:2082 rapid/rapid.py:2085
-msgid "Could not create temporary download directory"
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
+msgid "Select a folder to download videos to"
 msgstr ""
 
-#: rapid/rapid.py:2085
-msgid "Error:"
+#: rapid/rapid.py:3650
+msgid "and"
 msgstr ""
 
-#: rapid/rapid.py:2109
-msgid "Backup path does not exist"
+#: rapid/rapid.py:3655
+msgid "Using backup devices"
 msgstr ""
 
-#: rapid/rapid.py:2110
-#, python-format
-msgid "The path %s could not be created"
+#: rapid/rapid.py:3657
+msgid "Using backup device"
 msgstr ""
 
-#: rapid/rapid.py:2111
-msgid "No backups can occur"
+#: rapid/rapid.py:3659
+msgid "No backup devices detected"
 msgstr ""
 
-#: rapid/rapid.py:2140
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"%(problem)s"
+#: rapid/rapid.py:3686
+msgid "Free space:"
 msgstr ""
 
-#: rapid/rapid.py:2171 rapid/rapid.py:2517 rapid/rapid.py:2552
-#: rapid/rapid.py:2580 rapid/rapid.py:2611 rapid/rapid.py:2630
+#. (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:3698
 #, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
+msgid "(%(file_type)s)"
 msgstr ""
 
-#. hopefully inst will never be None, but just to be safe...
-#: rapid/rapid.py:2186
-msgid "Please check your system and try again."
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#: rapid/rapid.py:3702
+#, python-format
+msgid "%(free)s %(file_type)s"
 msgstr ""
 
-#: rapid/rapid.py:2206
-msgid "Photos detected with the same filenames, but taken at different times"
+#. 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:3707
+msgid "; "
 msgstr ""
 
-#: rapid/rapid.py:2246
-msgid "Photo has already been downloaded"
+#. 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:3712
+msgid "."
 msgstr ""
 
-#: rapid/rapid.py:2247 rapid/rapid.py:2646
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#. e.g. 14.7GB available
+#: rapid/rapid.py:3718
 #, python-format
-msgid "Source: %(source)s"
+msgid "%(free)s free"
 msgstr ""
 
-#. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:2445
-msgid "New day has started - resetting 'Downloads Today' sequence number"
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3726
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
 msgstr ""
 
-#: rapid/rapid.py:2516
+#. user manually specified backup location
+#: rapid/rapid.py:3729
 #, python-format
-msgid "Backup of %(file_type)s already exists"
+msgid "Backing up to %(path)s"
 msgstr ""
 
-#: rapid/rapid.py:2520
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3732
 #, python-format
-msgid "Backup %(file_type)s overwritten"
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr ""
 
-#: rapid/rapid.py:2524
+#: rapid/rapid.py:3739
 #, python-format
-msgid "%(file_type)s not backed up to %(volume)s"
+msgid "%(freespace)s. %(backuppaths)s."
 msgstr ""
 
-#: rapid/rapid.py:2526
-#, python-format
-msgid "%(file_type)s not backed up"
+#: rapid/rapid.py:3768
+msgid "Program preferences are invalid"
 msgstr ""
 
-#: rapid/rapid.py:2549 rapid/rapid.py:2577 rapid/rapid.py:2610
-#: rapid/rapid.py:2629
-msgid "Backing up error"
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
+msgid "Photo"
 msgstr ""
 
-#: rapid/rapid.py:2550 rapid/rapid.py:2578
-#, python-format
-msgid "Destination directory could not be created: %(directory)s\n"
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
+msgid "Video"
 msgstr ""
 
-#: rapid/rapid.py:2554 rapid/rapid.py:2613
+#: rapid/rapid.py:3921
 #, python-format
-msgid "Error: %(inst)s"
+msgid "%(file_type)s download folder does not exist"
 msgstr ""
 
-#: rapid/rapid.py:2555 rapid/rapid.py:2583 rapid/rapid.py:2614
-#: rapid/rapid.py:2633
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
-msgid "The %(file_type)s was not backed up."
+msgid "Folder: %s"
 msgstr ""
 
-#: rapid/rapid.py:2582 rapid/rapid.py:2632
+#: rapid/rapid.py:3935
 #, python-format
-msgid "Error: %(errno)s %(strerror)s"
+msgid "%(file_type)s download folder is invalid"
 msgstr ""
 
-#: rapid/rapid.py:2645
+#: rapid/rapid.py:3948
 #, python-format
-msgid "%(file_type)s could not be backed up"
+msgid "%(file_type)s download folder is not writable"
 msgstr ""
 
-#: rapid/rapid.py:2648
-msgid "No suitable backup volume was found"
+#: rapid/rapid.py:4034
+msgid "Thumbnails"
 msgstr ""
 
-#: rapid/rapid.py:2650
-msgid "A backup location was not found"
+#. 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:4089
+#, python-format
+msgid ""
+"display program information on the command line as the program runs "
+"(default: %default)"
 msgstr ""
 
-#: rapid/rapid.py:2704
-#, python-format
-msgid "This device has no %(types_searched_for)s to download from."
+#: rapid/rapid.py:4090
+msgid "display debugging information when run from the command line"
 msgstr ""
 
-#: rapid/rapid.py:2777
-#, python-format
-msgid "Download has started from %s"
+#: rapid/rapid.py:4091
+msgid "only output errors to the command line"
 msgstr ""
 
-#: rapid/rapid.py:2780
-#, python-format
-msgid "Attempting to download %s files"
+#. image file extensions are recognized RAW files plus TIFF and JPG
+#: rapid/rapid.py:4093
+msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 
-#. reset the progress bar to update the status of this download attempt
-#: rapid/rapid.py:2813 rapid/rapid.py:2880
-#, python-format
-msgid "%(number)s of %(total)s %(filetypes)s"
+#: rapid/rapid.py:4095
+msgid ""
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
 msgstr ""
 
-#: rapid/rapid.py:2876
-#, python-format
-msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
+#: rapid/rapid.py:4096
+msgid ""
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
 msgstr ""
 
-#: rapid/rapid.py:2901 rapid/rapid.py:2905
-msgid "Could not delete photo or video from device"
+#: rapid/rapid.py:4097
+msgid "reset all program settings and preferences and exit"
 msgstr ""
 
-#: rapid/rapid.py:2902
-#, python-format
+#: rapid/rapid.py:4110
 msgid ""
-"Photo: %(source)s\n"
-"Error: %(errno)s %(strerror)s"
+"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:2906
+#: rapid/rapid.py:4133
 #, python-format
-msgid "Photo: %(source)s"
+msgid "and %s"
 msgstr ""
 
-#: rapid/rapid.py:2908
-#, python-format
-msgid "Deleted %(number)i %(filetypes)s from device"
+#: rapid/rapid.py:4141
+msgid "All settings and preferences have been reset"
+msgstr ""
+
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
+msgid "Backing up error"
 msgstr ""
 
-#: rapid/rapid.py:2921
+#: rapid/backupfile.py:151
 #, python-format
-msgid "Download complete from %s"
+msgid "Destination directory could not be created: %(directory)s\n"
 msgstr ""
 
-#. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:3036 rapid/rapid.py:3505
-msgid "Device"
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
 msgstr ""
 
-#. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:3041 rapid/rapid.py:3494
-msgid "Size"
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
+#, python-format
+msgid "Error: %(inst)s"
 msgstr ""
 
-#: rapid/rapid.py:3044
-msgid "Download Progress"
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
 msgstr ""
 
-#: rapid/rapid.py:3132
-msgid "Downloading From Cameras"
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
 msgstr ""
 
-#: rapid/rapid.py:3138
-msgid "Downloading directly from a camera may work poorly or not at all"
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
 msgstr ""
 
-#: rapid/rapid.py:3139
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
+#, python-format
 msgid ""
-"Downloading from a card reader always works and is generally much faster. It "
-"is strongly recommended to use a card reader."
+"%(problem)s\n"
+"File: %(file)s"
 msgstr ""
 
-#: rapid/rapid.py:3153
-msgid "_Show this message again"
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
 msgstr ""
 
-#: rapid/rapid.py:3188
+#: rapid/device.py:80
 msgid "Device Detected"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3197
+#: 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/rapid.py:3216
+#: rapid/device.py:108
 msgid "_Remember this choice"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3253
-#, python-format
-msgid "%s selected for downloading from"
+#: rapid/downloadtracker.py:299
+msgid "MB/s"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3256
-msgid "This device or partition will always be used to download from"
+#: rapid/generatenameconfig.py:151
+msgid "Date time"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3259
-#, python-format
-msgid "%s rejected as a download device"
+#: rapid/generatenameconfig.py:152
+msgid "Text"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3262
-msgid "This device or partition will never be used to download from"
+#: rapid/generatenameconfig.py:153
+msgid "Filename"
 msgstr ""
 
-#: rapid/rapid.py:3269
-msgid "Remove all Job Codes?"
+#: rapid/generatenameconfig.py:154
+msgid "Metadata"
 msgstr ""
 
-#: rapid/rapid.py:3286
-msgid "Should all Job Codes be removed?"
+#: 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/rapid.py:3314
-msgid "Enter a Job Code"
-msgstr ""
+#: rapid/generatenameconfig.py:157 rapid/preferencesdialog.py:577
+msgid "Job code"
+msgstr "کد دستور"
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3333
-msgid "Enter a new Job Code, or select a previous one"
+#: rapid/generatenameconfig.py:158
+msgid "Image date"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3336
-msgid "Enter a new Job Code"
+#: rapid/generatenameconfig.py:159
+msgid "Video date"
 msgstr ""
 
-#: rapid/rapid.py:3341 rapid/rapid.py:4496
-msgid "Job Code:"
+#: rapid/generatenameconfig.py:160
+msgid "Today"
 msgstr ""
 
-#: rapid/rapid.py:3388
-msgid "Job Code entered"
+#: rapid/generatenameconfig.py:161
+msgid "Yesterday"
 msgstr ""
 
-#: rapid/rapid.py:3390
-msgid "Job Code not entered"
+#. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
+#: rapid/generatenameconfig.py:163
+msgid "Download time"
 msgstr ""
 
-#: rapid/rapid.py:3440
-msgid "Status"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:165
+msgid "Name + extension"
 msgstr ""
 
-#: rapid/rapid.py:3448
-msgid "Type"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:167
+msgid "Name"
 msgstr ""
 
-#: rapid/rapid.py:3457 rapid/rapid.py:4921 rapid/rapid.py:4923
-msgid "Photo"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:169
+msgid "Extension"
 msgstr ""
 
-#: rapid/rapid.py:3459
-msgid "File"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:171
+msgid "Image number"
 msgstr ""
 
-#: rapid/rapid.py:3474
-msgid "Job Code"
+#: rapid/generatenameconfig.py:172
+msgid "Video number"
 msgstr ""
 
-#: rapid/rapid.py:3484
-msgid "Date"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:174
+msgid "Aperture"
 msgstr ""
 
-#: rapid/rapid.py:3516 rapid/renamesubfolderprefs.py:194
-msgid "Filename"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:176
+msgid "ISO"
 msgstr ""
 
-#: rapid/rapid.py:3527
-msgid "Path"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:178
+msgid "Exposure time"
 msgstr ""
 
-#: rapid/rapid.py:3918
-#, python-format
-msgid "%(filetype)s was downloaded successfully"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:180
+msgid "Focal length"
 msgstr ""
 
-#: rapid/rapid.py:3920
-#, python-format
-msgid "%(filetype)s was not downloaded"
+#. 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 ""
 
-#: rapid/rapid.py:3922
-#, python-format
-msgid "%(filetype)s was downloaded with warnings"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:184
+msgid "Camera model"
 msgstr ""
 
-#: rapid/rapid.py:3924
-#, python-format
-msgid "%(filetype)s was downloaded but there were problems backing up"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:186
+msgid "Short camera model"
 msgstr ""
 
-#: rapid/rapid.py:3926
-#, python-format
-msgid "%(filetype)s was neither downloaded nor backed up"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:188
+msgid "Hyphenated short camera model"
 msgstr ""
 
-#: rapid/rapid.py:3928
-#, python-format
-msgid "%(filetype)s is ready to be downloaded"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:190
+msgid "Serial number"
 msgstr ""
 
-#: rapid/rapid.py:3930
-#, python-format
-msgid "%(filetype)s is about to be downloaded"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:192
+msgid "Shutter count"
 msgstr ""
 
-#: rapid/rapid.py:3932
-#, python-format
-msgid "%(filetype)s will be downloaded with warnings"
+#. File number currently refers to the Exif value Exif.Canon.FileNumber
+#: rapid/generatenameconfig.py:194
+msgid "File number"
 msgstr ""
 
-#: rapid/rapid.py:3934
-#, python-format
-msgid "%(filetype)s cannot be downloaded"
+#. Only the folder component of the Exif.Canon.FileNumber value
+#: rapid/generatenameconfig.py:196
+msgid "Folder only"
 msgstr ""
 
-#: rapid/rapid.py:4303
-msgid "Preview"
+#. The folder and file component of the Exif.Canon.FileNumber value
+#: rapid/generatenameconfig.py:198
+msgid "Folder and file"
 msgstr ""
 
-#: rapid/rapid.py:4518
-msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:200
+msgid "Owner name"
 msgstr ""
 
-#: rapid/rapid.py:4887
-#, python-format
-msgid "%(free)s available"
+#: rapid/generatenameconfig.py:201
+msgid "Codec"
 msgstr ""
 
-#. user manually specified backup location
-#: rapid/rapid.py:4894
-#, python-format
-msgid "Backing up to %(path)s"
+#: rapid/generatenameconfig.py:202
+msgid "Width"
 msgstr ""
 
-#: rapid/rapid.py:4899
-#, python-format
-msgid "%(freespace)s. %(backuppaths)s."
+#: rapid/generatenameconfig.py:203
+msgid "Height"
 msgstr ""
 
-#: rapid/rapid.py:4908
-#, python-format
-msgid ""
-"Sorry, this device location does not exist:\n"
-"%(path)s\n"
-"\n"
-"Please resolve the problem, or modify your preferences."
+#: rapid/generatenameconfig.py:204
+msgid "Length"
 msgstr ""
 
-#: rapid/rapid.py:4912
-msgid "Problem with Device Location Folder"
+#: rapid/generatenameconfig.py:205
+msgid "Frames Per Second"
 msgstr ""
 
-#: rapid/rapid.py:4921
-msgid "Video"
+#: rapid/generatenameconfig.py:206
+msgid "Artist"
 msgstr ""
 
-#: rapid/rapid.py:4928
-#, python-format
-msgid "The %(file_type)s Download Folder does not exist.\n"
+#: rapid/generatenameconfig.py:207
+msgid "Copyright"
 msgstr ""
 
-#: rapid/rapid.py:4937
-#, python-format
-msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: rapid/generatenameconfig.py:209
+msgid "Downloads today"
 msgstr ""
 
-#: rapid/rapid.py:4942
-msgid ""
-"Sorry, problems were encountered with your download folders. Please fix the "
-"problems or modify the preferences.\n"
-"\n"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: rapid/generatenameconfig.py:211
+msgid "Session number"
 msgstr ""
 
-#: rapid/rapid.py:4945
-msgid "Problem with Download Folder"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: rapid/generatenameconfig.py:213
+msgid "Subfolder number"
 msgstr ""
 
-#: rapid/rapid.py:4947
-msgid "Problem with Download Folders"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: rapid/generatenameconfig.py:215
+msgid "Stored number"
 msgstr ""
 
-#: rapid/rapid.py:4960
-msgid "Some preferences will be reset."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
+#: rapid/generatenameconfig.py:217
+msgid "Sequence letter"
 msgstr ""
 
-#: rapid/rapid.py:4993
-msgid "Displaying warning about downloading directly from camera"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:219
+msgid "All digits"
 msgstr ""
 
-#: rapid/rapid.py:5003
-#, python-format
-msgid "Prompting whether to use %s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:221
+msgid "Last digit"
 msgstr ""
 
-#: rapid/rapid.py:5030
-msgid "Prompting for Job Code"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:223
+msgid "Last 2 digits"
 msgstr ""
 
-#: rapid/rapid.py:5034
-msgid "Already prompting for Job Code, do not prompt again"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:225
+msgid "Last 3 digits"
 msgstr ""
 
-#: rapid/rapid.py:5051
-msgid "Starting downloads"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:227
+msgid "Last 4 digits"
 msgstr ""
 
-#. autostart is true
-#: rapid/rapid.py:5055
-msgid "Starting downloads that have been waiting for a Job Code"
+#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
+#: rapid/generatenameconfig.py:229
+msgid "Original Case"
 msgstr ""
 
-#: rapid/rapid.py:5102
-#, python-format
-msgid "Creating photo download folder %(folder)s"
+#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
+#: rapid/generatenameconfig.py:231
+msgid "UPPERCASE"
 msgstr ""
 
-#: rapid/rapid.py:5107
-#, python-format
-msgid "Failed to create default photo download folder %(folder)s"
+#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
+#: rapid/generatenameconfig.py:233
+msgid "lowercase"
 msgstr ""
 
-#: rapid/rapid.py:5111
-#, python-format
-msgid "Creating video download folder %(folder)s"
+#: rapid/generatenameconfig.py:234
+msgid "One digit"
 msgstr ""
 
-#: rapid/rapid.py:5116
-#, python-format
-msgid "Failed to create default video download folder %(folder)s"
+#: rapid/generatenameconfig.py:235
+msgid "Two digits"
 msgstr ""
 
-#: rapid/rapid.py:5141
-msgid ""
-"A newer version of this program was previously run on this computer.\n"
-"\n"
+#: rapid/generatenameconfig.py:236
+msgid "Three digits"
 msgstr ""
 
-#: rapid/rapid.py:5143
-msgid ""
-"Program preferences appear to be valid, but please check them to ensure "
-"correct operation."
+#: rapid/generatenameconfig.py:237
+msgid "Four digits"
 msgstr ""
 
-#: rapid/rapid.py:5145
-msgid "Sorry, some preferences are invalid and will be reset."
+#: rapid/generatenameconfig.py:238
+msgid "Five digits"
 msgstr ""
 
-#: rapid/rapid.py:5146
-msgid "Warning:"
+#: rapid/generatenameconfig.py:239
+msgid "Six digits"
 msgstr ""
 
-#: rapid/rapid.py:5151
-msgid ""
-"This version of the program is newer than the previously run version. "
-"Checking preferences."
+#: rapid/generatenameconfig.py:240
+msgid "Seven digits"
 msgstr ""
 
-#: rapid/rapid.py:5158
-msgid "Preferences were modified."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:242
+msgid "Subseconds"
 msgstr ""
 
-#: rapid/rapid.py:5159
-msgid ""
-"This version of the program uses different preferences than the old version. "
-"Your preferences have been updated.\n"
-"\n"
-"Please check them to ensure correct operation."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:244
+msgid "YYYYMMDD"
 msgstr ""
 
-#: rapid/rapid.py:5163
-msgid "No preferences needed to be changed."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:246
+msgid "YYYY-MM-DD"
 msgstr ""
 
-#: rapid/rapid.py:5165
-msgid ""
-"This version of the program uses different preferences than the old version. "
-"Some of your previous preferences were invalid, and could not be updated. "
-"They will be reset."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:248
+msgid "YYMMDD"
 msgstr ""
 
-#: rapid/rapid.py:5175
-msgid "Problem using pynotify."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:250
+msgid "YY-MM-DD"
 msgstr ""
 
-#: rapid/rapid.py:5191
-msgid "Failed to receive pynotify server capabilities."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:252
+msgid "MMDDYYYY"
 msgstr ""
 
-#: rapid/rapid.py:5202
-msgid ""
-"Warning: desktop environment notification server is incorrectly configured."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:254
+msgid "MMDDYY"
 msgstr ""
 
-#: rapid/rapid.py:5250
-msgid "and"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:256
+msgid "MMDD"
 msgstr ""
 
-#: rapid/rapid.py:5255
-msgid "Using backup devices"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:258
+msgid "DDMMYYYY"
 msgstr ""
 
-#: rapid/rapid.py:5257
-msgid "Using backup device"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:260
+msgid "DDMMYY"
 msgstr ""
 
-#: rapid/rapid.py:5259
-msgid "No backup devices detected"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:262
+msgid "YYYY"
 msgstr ""
 
-#: rapid/rapid.py:5309 rapid/rapid.py:5471
-#, python-format
-msgid "Device %(device)s (%(path)s) ignored"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:264
+msgid "YY"
 msgstr ""
 
-#: rapid/rapid.py:5430
-#, python-format
-msgid "Detected %(device)s with path %(path)s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:266
+msgid "MM"
 msgstr ""
 
-#: rapid/rapid.py:5434
-msgid "Automatically start download is true"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:268
+msgid "DD"
 msgstr ""
 
-#: rapid/rapid.py:5436
-msgid "Automatically start download is false"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:270
+msgid "Month (full)"
 msgstr ""
 
-#: rapid/rapid.py:5489
-msgid "Using manually specified path"
+#. 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 ""
 
-#. the user is trying to backup to a device that is currently being downloaded from..... we don't normally allow that, but what to do?
-#: rapid/rapid.py:5557
-#, python-format
-msgid "Warning: backup device %(device)s is currently being downloaded from"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:274
+msgid "HHMMSS"
 msgstr ""
 
-#: rapid/rapid.py:5573
-msgid "D_ownload Selected"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:276
+msgid "HHMM"
 msgstr ""
 
-#: rapid/rapid.py:5665 rapid/rapid.py:5716
-msgid "All downloads complete"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:278
+msgid "HH-MM-SS"
 msgstr ""
 
-#: rapid/rapid.py:5680
-msgid "MB/s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:280
+msgid "HH-MM"
 msgstr ""
 
-#: rapid/rapid.py:5690
-msgid "About 1 second remaining"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:282
+msgid "HH"
 msgstr ""
 
-#: rapid/rapid.py:5692
-#, python-format
-msgid "About %i seconds remaining"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:284
+msgid "MM (minutes)"
 msgstr ""
 
-#: rapid/rapid.py:5694
-msgid "About 1 minute remaining"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:286
+msgid "SS"
 msgstr ""
 
-#. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
-#. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
-#. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:5699
+#: rapid/preferencesdialog.py:374
 #, python-format
-msgid "About %(minutes)i:%(seconds)02i minutes remaining"
+msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: rapid/rapid.py:5719 rapid/rapid.py:5725 rapid/rapid.py:5731
-#: rapid/rapid.py:5737 rapid/rapid.py:5742 rapid/rapid.py:5746
+#: rapid/preferencesdialog.py:376
 #, python-format
-msgid "%(number)s %(numberdownloaded)s"
+msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: rapid/rapid.py:5721 rapid/rapid.py:5733
+#: rapid/preferencesdialog.py:380
 #, python-format
-msgid "%(filetype)s downloaded"
+msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#: rapid/rapid.py:5727 rapid/rapid.py:5739
-#, python-format
-msgid "%(filetype)s failed to download"
+#: rapid/preferencesdialog.py:439 rapid/preferencesdialog.py:700
+msgid "Remove all Job Codes?"
 msgstr ""
 
-#: rapid/rapid.py:5907
-msgid "_Resume"
+#: rapid/preferencesdialog.py:440 rapid/preferencesdialog.py:717
+msgid "Should all Job Codes be removed?"
 msgstr ""
 
-#: rapid/rapid.py:5910
-msgid "_Download All"
+#: rapid/preferencesdialog.py:446
+msgid "Remove all Remembered Paths?"
 msgstr ""
 
-#. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:5919
-msgid "_Pause"
+#: rapid/preferencesdialog.py:447
+msgid "Should all remembered paths be removed?"
 msgstr ""
 
-#: rapid/rapid.py:6031
-msgid "Download device settings preferences were changed."
+#: rapid/preferencesdialog.py:453
+msgid "Remove all Ignored Paths?"
 msgstr ""
 
-#: rapid/rapid.py:6043
-msgid "Backup preferences were changed."
+#: rapid/preferencesdialog.py:454
+msgid "Should all ignored paths be removed?"
 msgstr ""
 
-#: rapid/rapid.py:6049
-msgid "Subfolder and filename preferences were changed."
+#: rapid/preferencesdialog.py:465
+msgid "Error in Photo Rename preferences"
 msgstr ""
 
-#: rapid/rapid.py:6060
-msgid "Download folder preferences were changed."
+#: rapid/preferencesdialog.py:645
+msgid "Error in Video Rename preferences"
 msgstr ""
 
-#: rapid/rapid.py:6259
-msgid "Goodbye"
+#: rapid/preferencesdialog.py:666
+msgid "Error in Photo Download Subfolders preferences"
 msgstr ""
 
-#. Translators: this text is displayed to the user when they request information on the command line options.
-#. The text %default should not be modified or left out.
-#: rapid/rapid.py:6270
-#, python-format
-msgid ""
-"display program information on the command line as the program runs "
-"(default: %default)"
+#: rapid/preferencesdialog.py:683
+msgid "Error in Video Download Subfolders preferences"
 msgstr ""
 
-#: rapid/rapid.py:6271
-msgid "only output errors to the command line"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:742
+msgid "Enter a Job Code"
 msgstr ""
 
-#. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:6273
-msgid "list photo and video file extensions the program recognizes and exit"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:758
+msgid "Enter a new Job Code, or select a previous one"
 msgstr ""
 
-#: rapid/rapid.py:6274
-msgid "reset all program settings and preferences and exit"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:761
+msgid "Enter a new Job Code"
 msgstr ""
 
-#: rapid/rapid.py:6283
-msgid "Photos:"
+#: rapid/preferencesdialog.py:766
+msgid "Job Code:"
 msgstr ""
 
-#: rapid/rapid.py:6283
-msgid "Videos:"
+#: rapid/preferencesdialog.py:822
+msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: rapid/rapid.py:6288
-#, python-format
-msgid "and %s"
+#: rapid/preferencesdialog.py:834
+msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: rapid/rapid.py:6296
-msgid "All settings and preferences have been reset"
+#: rapid/preferencesdialog.py:839
+msgid "Path:"
 msgstr ""
 
-#. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:6300 rapid/rapid.py:6301 rapid/rapid.py:6303
-#: rapid/rapid.py:6308 rapid/rapid.py:6312
-msgid "Using"
+#: rapid/preferencesdialog.py:1092
+msgid "Job Code"
 msgstr ""
 
-#: rapid/rapid.py:6305
-msgid "\n"
-msgstr "\n"
+#: rapid/preferencesdialog.py:1363
+msgid "Select a folder in which to backup photos"
+msgstr ""
 
-#. this application is already running
-#: rapid/rapid.py:6329
-#, python-format
-msgid "%s is already running"
+#: rapid/preferencesdialog.py:1376
+msgid "Select a folder in which to backup videos"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:192
-msgid "Date time"
+#. 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:1473
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:193
-msgid "Text"
+#: rapid/preferencesdialog.py:1524
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
+"subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:195
-msgid "Metadata"
+#. 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:1527
+#, python-format
+msgid "<i>Example: %s</i>"
+msgstr "<i>مثال : %s</i>"
+
+#. Preferences list is now empty
+#: rapid/preferencesdialog.py:1617
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
+"They will be reset to their default values."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:196
-msgid "Sequences"
+#: rapid/preferencesdialog.py:1762
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:199
-msgid "Image date"
+#: rapid/preferencesdialog.py:1764
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:200
-msgid "Video date"
+#: rapid/preferencesdialog.py:1765
+msgid "Invalid regular expression"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:201
-msgid "Today"
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1949
+msgid "externaldrive1"
+msgstr "درایو خارجی 1"
+
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1951
+msgid "externaldrive2"
+msgstr "درایو خارجی 2"
+
+#: rapid/prefsrapid.py:127
+msgid "New York"
+msgstr "نیویورک"
+
+#: rapid/prefsrapid.py:128
+msgid "Manila"
+msgstr "مانیل"
+
+#: rapid/prefsrapid.py:128
+msgid "Prague"
+msgstr "پراگ"
+
+#: rapid/prefsrapid.py:128
+msgid "Helsinki"
+msgstr "هلسینکی"
+
+#: rapid/prefsrapid.py:128
+msgid "Wellington"
+msgstr "ولینگتون"
+
+#: rapid/prefsrapid.py:129
+msgid "Tehran"
+msgstr "تهران"
+
+#: rapid/prefsrapid.py:129
+msgid "Kampala"
+msgstr "کامپلا"
+
+#: rapid/prefsrapid.py:129
+msgid "Paris"
+msgstr "پاریس"
+
+#: rapid/prefsrapid.py:129
+msgid "Berlin"
+msgstr "برلین"
+
+#: rapid/prefsrapid.py:129
+msgid "Sydney"
+msgstr "سیدنی"
+
+#: rapid/prefsrapid.py:130
+msgid "Budapest"
+msgstr "بوداپست"
+
+#: rapid/prefsrapid.py:130
+msgid "Rome"
+msgstr "رم"
+
+#: rapid/prefsrapid.py:130
+msgid "Moscow"
+msgstr "مسکو"
+
+#: rapid/prefsrapid.py:130
+msgid "Delhi"
+msgstr "دهلی"
+
+#: rapid/prefsrapid.py:130
+msgid "Warsaw"
+msgstr "ورشو"
+
+#: rapid/prefsrapid.py:131
+msgid "Jakarta"
+msgstr "جاکارتا"
+
+#: rapid/prefsrapid.py:131
+msgid "Madrid"
+msgstr "مادرید"
+
+#: rapid/prefsrapid.py:131
+msgid "Stockholm"
+msgstr "استکهلم"
+
+#. components
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
+msgid "subfolder"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:202
-msgid "Yesterday"
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
+msgid "filename"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:204
-msgid "Name + extension"
+#: rapid/problemnotification.py:85
+#, python-format
+msgid "Date time value %s appears invalid."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:206
-msgid "Name"
+#: rapid/problemnotification.py:86
+msgid "Filename does not have an extension."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:208
-msgid "Extension"
+#. a number component is something like the 8346 in IMG_8346.JPG
+#: rapid/problemnotification.py:88
+msgid "Filename does not have a number component."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:210
-msgid "Image number"
+#: rapid/problemnotification.py:89
+#, python-format
+msgid "Error generating component %s."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:211
-msgid "Video number"
+#. a generic problem
+#: rapid/problemnotification.py:91
+#, python-format
+msgid "%(filetype)s metadata cannot be read"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:213
-msgid "Aperture"
+#: rapid/problemnotification.py:93
+#, python-format
+msgid "%(filetype)s %(area)s could not be generated"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:215
-msgid "ISO"
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
+#, python-format
+msgid "An error occurred when copying the %(filetype)s"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:217
-msgid "Exposure time"
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:219
-msgid "Focal length"
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
+#, python-format
+msgid "%(filetype)s already exists"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:221
-msgid "Camera make"
+#: rapid/problemnotification.py:105
+#, python-format
+msgid ""
+"%(filetype)s could not be backed up because no suitable backup locations "
+"were found."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:223
-msgid "Camera model"
+#: rapid/problemnotification.py:110
+#, 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 ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:225
-msgid "Short camera model"
+#: rapid/problemnotification.py:111
+#, python-format
+msgid "%(filetype)s was already downloaded"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:227
-msgid "Hyphenated short camera model"
+#: rapid/problemnotification.py:115
+#, python-format
+msgid ""
+"The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+"identifier '%(identifier)s' added."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:229
-msgid "Serial number"
+#: rapid/problemnotification.py:116
+#, python-format
+msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:231
-msgid "Shutter count"
+#: rapid/problemnotification.py:117
+#, python-format
+msgid "There is no data with which to name the %(filetype)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:233
-msgid "Owner name"
+#: rapid/problemnotification.py:119
+#, python-format
+msgid "Error: %(errorno)s %(strerror)s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:234
-msgid "Codec"
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:235
-msgid "Width"
+#: rapid/problemnotification.py:213
+msgid "The metadata might be corrupt."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:236
-msgid "Height"
+#: rapid/problemnotification.py:216
+msgid ""
+"The filename, extension and Exif information indicate it has already been "
+"downloaded."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:237
-msgid "Length"
+#: rapid/problemnotification.py:235
+#, python-format
+msgid " It was backed up to %(volume)s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:238
-msgid "Frames Per Second"
+#: rapid/problemnotification.py:237
+msgid " It was backed up to these devices: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:240
-msgid "Downloads today"
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
+#, python-format
+msgid "%s, "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:242
-msgid "Session number"
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
+#, python-format
+msgid "%(volumes)s and %(final_volume)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:244
-msgid "Subfolder number"
+#: rapid/problemnotification.py:252
+#, python-format
+msgid ""
+"Photos detected with the same filenames, but taken at different times: "
+"%(details)s"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:246
-msgid "Stored number"
+#: rapid/problemnotification.py:269
+#, python-format
+msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:248
-msgid "Sequence letter"
+#: rapid/problemnotification.py:271
+#, python-format
+msgid "An error occurred when backing up on %(volume)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:250
-msgid "All digits"
+#: rapid/problemnotification.py:273
+msgid "Errors occurred when backing up on the following backup devices: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:252
-msgid "Last digit"
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
+#, python-format
+msgid "%(volume)s (%(inst)s), "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:254
-msgid "Last 2 digits"
+#: rapid/problemnotification.py:279
+#, python-format
+msgid "%(volume)s, "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:256
-msgid "Last 3 digits"
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
+#, python-format
+msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:258
-msgid "Last 4 digits"
+#: rapid/problemnotification.py:288
+#, python-format
+msgid "%(volumes)s and %(volume)s."
 msgstr ""
 
-#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:260
-msgid "Original Case"
+#: rapid/problemnotification.py:296
+#, python-format
+msgid "Backup already exists on %(volume)s."
 msgstr ""
 
-#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:262
-msgid "UPPERCASE"
+#: rapid/problemnotification.py:298
+msgid "Backups already exist in these locations: "
 msgstr ""
 
-#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:264
-msgid "lowercase"
+#: rapid/problemnotification.py:308
+#, python-format
+msgid "Backup overwritten on %(volume)s."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:265
-msgid "One digit"
+#: rapid/problemnotification.py:310
+msgid "Backups overwritten on these devices: "
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:266
-msgid "Two digits"
+#: rapid/problemnotification.py:321
+#, python-format
+msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:267
-msgid "Three digits"
+#: rapid/problemnotification.py:323
+msgid ""
+"Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:268
-msgid "Four digits"
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:269
-msgid "Five digits"
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:270
-msgid "Six digits"
+#: rapid/problemnotification.py:347
+#, python-format
+msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:271
-msgid "Seven digits"
+#: rapid/problemnotification.py:355
+#, python-format
+msgid " Furthermore, there were %(problems)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
-msgid "Subseconds"
+#: rapid/problemnotification.py:357
+#, python-format
+msgid " Furthermore, there was a %(problem)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
-msgid "YYYYMMDD"
+#: rapid/problemnotification.py:366
+#, python-format
+msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
-msgid "YYYY-MM-DD"
+#: rapid/problemnotification.py:368
+msgid "The following metadata is missing: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
-msgid "YYMMDD"
+#: rapid/problemnotification.py:371
+#, python-format
+msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
-msgid "YY-MM-DD"
+#: rapid/problemnotification.py:388
+msgid "Problems in subfolder and filename generation"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
-msgid "MMDDYYYY"
+#: rapid/problemnotification.py:390
+msgid "Problem in subfolder and filename generation"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
-msgid "MMDDYY"
+#: rapid/problemnotification.py:393
+#, python-format
+msgid "Problems in %s generation"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
-msgid "MMDD"
+#: rapid/problemnotification.py:395
+#, python-format
+msgid "Problem in %s generation"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
-msgid "DDMMYYYY"
+#: rapid/problemnotification.py:404
+#, python-format
+msgid "%(filetype)s already exists, but it was backed up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
-msgid "DDMMYY"
+#: rapid/problemnotification.py:406
+#, python-format
+msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
-msgid "YYYY"
+#: rapid/problemnotification.py:428
+msgid "Multiple problems were encountered"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:295
-msgid "YY"
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
+msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:297
-msgid "MM"
+#: rapid/problemnotification.py:436
+msgid "there were errors backing up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:299
-msgid "DD"
+#: rapid/problemnotification.py:437
+msgid "There were errors backing up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:301
-msgid "HHMMSS"
+#: rapid/problemnotification.py:439
+msgid "there was an error backing up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:303
-msgid "HHMM"
+#: rapid/problemnotification.py:440
+msgid "There was an error backing up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:305
-msgid "HH-MM-SS"
+#. e.g.
+#: rapid/problemnotification.py:443
+#, python-format
+msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:307
-msgid "HH-MM"
+#: rapid/rpdfile.py:159
+#, python-format
+msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:309
-msgid "HH"
+#: rapid/rpdfile.py:169
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:311
-msgid "MM (minutes)"
+#: rapid/subfolderfile.py:81
+#, python-format
+msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:313
-msgid "SS"
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:796
-#, python-format
-msgid ""
-"Preference key '%(key)s' is invalid.\n"
-"Expected one of %(value)s"
+#: rapid/subfolderfile.py:406
+msgid "Photo has already been downloaded"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:803
+#: rapid/subfolderfile.py:407
 #, python-format
-msgid "Preference value '%(value)s' is invalid"
+msgid "Source: %(source)s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:807
-msgid "These preferences are not well formed:"
+#: rapid/subfolderfile.py:485
+msgid "Failed to create download subfolder"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1517
+#: rapid/subfolderfile.py:486
 #, python-format
-msgid "Subfolder preferences should not start with a %s"
+msgid "Path: %s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1519
-#, python-format
-msgid "Subfolder preferences should not end with a %s"
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1523
-#, python-format
-msgid "Subfolder preferences should not contain two %s one after the other"
+#: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:1
-msgid " "
-msgstr " "
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:2
-msgid "      "
-msgstr "      "
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:3
-msgid " hh:mm"
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:4
-msgid ":"
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:5
-msgid "<b>Backup</b>"
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:6
-msgid "<b>Compatibility with Other Operating Systems</b>"
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:7
-msgid "<b>Devices</b>"
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:8
-msgid "<b>Download Folder</b>"
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:9
-msgid "<b>Download Subfolders</b>"
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:10
-msgid "<b>Example</b>"
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:11
-msgid "<b>Job Codes</b>"
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:12
-msgid "<b>Photo Rename</b>"
+#: rapid/glade3/rapid.ui.h:16
+msgid "_File"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:13
-msgid "<b>Photo and Video Name Conflicts</b>"
+#: rapid/glade3/rapid.ui.h:17
+msgid "Download / Pause"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:14
-msgid "<b>Program Automation</b>"
+#: rapid/glade3/rapid.ui.h:18
+msgid "_Select"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:15
-msgid "<b>Sequence Numbers</b>"
+#: rapid/glade3/rapid.ui.h:19
+msgid "Select All Without _Job Code"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:16
-msgid "<i>/media/externaldrive/Photos</i>"
+#: rapid/glade3/rapid.ui.h:20
+msgid "Select All Wit_h Job Code"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:17
-msgid "<i>Example: /home/user/Pictures</i>"
+#: rapid/glade3/rapid.ui.h:21
+msgid "_View"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:18
-msgid "<i>Example:</i>"
+#: rapid/glade3/rapid.ui.h:22
+msgid "_Error Log"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:19
-msgid "<i>New:</i>"
+#: rapid/glade3/rapid.ui.h:23
+msgid "_Clear Completed Downloads"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:20
-msgid "<i>Original:</i>"
+#: rapid/glade3/rapid.ui.h:24
+msgid "Previous File"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:21
-msgid "<span weight=\"bold\" size=\"x-large\">Automation</span>"
+#: rapid/glade3/rapid.ui.h:25
+msgid "Next File"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:22
-msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+#: rapid/glade3/rapid.ui.h:26
+msgid "_Help"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:23
-msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+#: rapid/glade3/rapid.ui.h:27
+msgid "_Translate this Application..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
+#: rapid/glade3/rapid.ui.h:28
+msgid "_Include in download"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:25
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+#: rapid/glade3/rapid.ui.h:29
+msgid "_Download"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:26
+#: rapid/glade3/prefs.ui.h:1
+msgid "Preferences: Rapid Photo Downloader"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:2
 msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+#: rapid/glade3/prefs.ui.h:3
+msgid "<i>Example: /home/user/Pictures</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
+#: rapid/glade3/prefs.ui.h:4
+msgid "<b>Download Subfolders</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:29
-msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+#: rapid/glade3/prefs.ui.h:5
+msgid "Download folder:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:30
-msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+#: rapid/glade3/prefs.ui.h:6
+msgid ""
+"Choose the download folder. Subfolders for the downloaded photos will be "
+"automatically created in this folder using the structure specified below."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:31
-msgid "Add unique identifier"
+#: rapid/glade3/prefs.ui.h:7
+msgid "<b>Download Folder</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:32
-msgid "Automatically detect Portable Storage Devices"
+#: rapid/glade3/prefs.ui.h:8
+msgid "Photo Folders"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:33
-msgid "Automatically detect backup devices"
+#: rapid/glade3/prefs.ui.h:9
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:34
-msgid "Automatically detect devices"
+#: rapid/glade3/prefs.ui.h:10
+msgid "<b>Photo Rename</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:35
-msgid "Automation"
+#: rapid/glade3/prefs.ui.h:11
+msgid " "
+msgstr " "
+
+#: rapid/glade3/prefs.ui.h:12
+msgid "<i>New:</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:36
-msgid "Backup"
+#: rapid/glade3/prefs.ui.h:13
+msgid "<i>Original:</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:37
-msgid "Backup location:"
+#: rapid/glade3/prefs.ui.h:14
+msgid "<b>Example</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:38
-msgid "Backup photos and videos when downloading"
+#: rapid/glade3/prefs.ui.h:15
+msgid "Photo Rename"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:39
+#: rapid/glade3/prefs.ui.h:16
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:17
 msgid ""
-"Choose the download folder. Subfolders for the downloaded photos will be "
-"automatically created in this folder using the structure specified below."
+"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 ""
 
-#: rapid/glade3/rapid.glade.h:40
+#: rapid/glade3/prefs.ui.h:18
 msgid ""
 "Choose the download folder. Subfolders for the downloaded videos will be "
 "automatically created in this folder using the structure specified below."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-10"
+#: rapid/glade3/prefs.ui.h:19
+msgid "Video Folders"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:42
-msgid "Day start:"
+#: rapid/glade3/prefs.ui.h:20
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:43
-msgid "Delete photos and videos from device upon download completion"
+#: rapid/glade3/prefs.ui.h:21
+msgid "Video Rename"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:44
-msgid "Devices"
+#: rapid/glade3/prefs.ui.h:22
+msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:45
-msgid ""
-"Devices are from where to download photos and videos, such as cameras, "
-"memory cards or Portable Storage Devices.\n"
-"\n"
-"You can download photos from multiple devices simultaneously, or you can "
-"specify a location on your hard drive.\n"
-"\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
+#: rapid/glade3/prefs.ui.h:23
+msgid "<b>Sequence Numbers</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Download / Pause"
+#: rapid/glade3/prefs.ui.h:24
+msgid ""
+"Specify the time in 24 hour format at which the <i>Downloads today</i> "
+"sequence number should be reset."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:51
-msgid "Download folder:"
+#: rapid/glade3/prefs.ui.h:25
+msgid "Day start:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:52
+#: rapid/glade3/prefs.ui.h:26
 msgid "Downloads today:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:53
-msgid "Error Handling"
+#: rapid/glade3/prefs.ui.h:27
+msgid "Stored number:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:54
-msgid "Error Log"
+#: rapid/glade3/prefs.ui.h:28
+msgid ":"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Exit program if download completes without any warnings or errors"
+#: rapid/glade3/prefs.ui.h:29
+msgid " hh:mm"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:56
-msgid "If you disable automatic detection, choose the exact backup location."
+#: rapid/glade3/prefs.ui.h:30
+msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:57
-msgid ""
-"If you disable automatic detection, choose the exact location of the images "
-"and videos."
+#: rapid/glade3/prefs.ui.h:31
+msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:58
+#: rapid/glade3/prefs.ui.h:32
 msgid ""
-"If you enable automatic detection of Portable Storage Devices, the entire "
-"device will be scanned for images. On large devices, this could take some "
-"time."
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:59
-msgid "Import your photos and videos efficiently and reliably"
+#: rapid/glade3/prefs.ui.h:33
+msgid "Strip incompatible characters"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:60
-msgid "Job Codes"
+#: rapid/glade3/prefs.ui.h:34
+msgid "Rename Options"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:61
-msgid "Location:"
+#: rapid/glade3/prefs.ui.h:35
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:62
-msgid "Overwrite"
+#: rapid/glade3/prefs.ui.h:36
+msgid "<b>Job Codes</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:63
-msgid "P_review Columns"
+#: rapid/glade3/prefs.ui.h:37
+msgid "_Add..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:64
-msgid "Photo Folders"
+#: rapid/glade3/prefs.ui.h:39
+msgid "R_emove All"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:65
-msgid "Photo Rename"
+#: rapid/glade3/prefs.ui.h:40
+msgid "Job Codes"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:66
-msgid "Photo backup folder name:"
+#: rapid/glade3/prefs.ui.h:41
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:67
-msgid "Preferences: Rapid Photo Downloader"
+#: rapid/glade3/prefs.ui.h:42
+msgid "Devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:68
-msgid "Preview _Folders"
+#: 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"
+"\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\n"
+"\n"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:70
-msgid "R_emove All"
+#: rapid/glade3/prefs.ui.h:48
+msgid "Automatically detect Portable Storage Devices"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:49
+msgid "Automatically detect devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:72
+#: rapid/glade3/prefs.ui.h:50
 msgid ""
-"Rapid Photo Downloader is free software; you can redistribute it and/or "
-"modify it under the terms of the GNU General Public License as published by "
-"the Free Software Foundation; either version 2 of the License, or (at your "
-"option) any later version.\n"
-"\n"
-"Rapid Photo Downloader is distributed in the hope that it will be useful, "
-"but WITHOUT ANY WARRANTY; without even the implied warranty of "
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
-"Public License for more details.\n"
+"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"
-"You should have received a copy of the GNU General Public License along with "
-"Rapid Photo Downloader; if not, write to the Free Software Foundation, Inc., "
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"When this option is enabled, and a potential device is detected, you will be "
+"prompted to determine if it should be scanned or not."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:77
-msgid "Rename Options"
+#: rapid/glade3/prefs.ui.h:53
+msgid "Location:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:78
-msgid "Se_lect None"
+#: rapid/glade3/prefs.ui.h:54
+msgid ""
+"If you disable automatic detection, choose the exact location of the photos "
+"and videos."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:79
-msgid "Select All Pho_tos"
+#: rapid/glade3/prefs.ui.h:55
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:80
-msgid "Select All Vi_deos"
+#: rapid/glade3/prefs.ui.h:56
+msgid "Remembered Paths"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:81
-msgid "Select All Wit_h Job Code"
+#: rapid/glade3/prefs.ui.h:57
+msgid ""
+"Remembered paths are those associated with devices that you have chosen to "
+"always scan or ignore when automatic detection of Portable Storage Devices "
+"is enabled."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:82
-msgid "Select All Without _Job Code"
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:59
+msgid ""
+"Specify the ending portion of any paths you want ignored when scanning "
+"devices for photos or videos. Any path ending with the values below will not "
+"be scanned."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:83
-msgid "Select _All"
+#: rapid/glade3/prefs.ui.h:61
+msgid "Re_move All"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:84
-msgid "Skip"
+#: rapid/glade3/prefs.ui.h:62
+msgid "Use _python-style regular expressions"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:85
-msgid "Skip download"
+#: rapid/glade3/prefs.ui.h:63
+msgid "Device Options"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/prefs.ui.h:64
+msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:65
+msgid "<b>Backup</b>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:66
 msgid ""
-"Sorry, video downloading functionality disabled. To download videos, please "
-"install the <i>kaa metadata</i> package for python."
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/prefs.ui.h:67
+msgid "Automatically detect backup devices"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:68
+msgid ""
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:69
+msgid "Back up photos and videos when downloading"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:70
 msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
@@ -1785,136 +1834,163 @@ msgid ""
 "a folder in it with one of these names.</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:90
-msgid ""
-"Specify the time in 24 hour format at which the <i>Downloads today</i> "
-"sequence number should be reset."
+#: rapid/glade3/prefs.ui.h:73
+msgid "Photo backup location:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:91
-msgid ""
-"Specify whether photo, video and folder names should have any characters "
-"removed that are not allowed by other operating systems."
+#: rapid/glade3/prefs.ui.h:74
+msgid "Photo backup folder name:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:92
-msgid "Start downloading at program startup"
+#: rapid/glade3/prefs.ui.h:75
+msgid "<i>Example:</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:93
-msgid "Start downloading upon device insertion"
+#: rapid/glade3/prefs.ui.h:76
+msgid "<i>/media/externaldrive/Photos</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:94
-msgid "Stored number:"
+#: rapid/glade3/prefs.ui.h:77
+msgid "Video backup folder name:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:95
-msgid "Strip incompatible characters"
+#: rapid/glade3/prefs.ui.h:78
+msgid "Video backup location:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:96
-msgid "Synchronize RAW + JPEG sequence numbers"
+#: rapid/glade3/prefs.ui.h:79
+msgid "Back up"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:97
-msgid "Unmount (\"eject\") device upon download completion"
+#: rapid/glade3/prefs.ui.h:80
+msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:98
-msgid "Video Folders"
+#: rapid/glade3/prefs.ui.h:81
+msgid "<b>Program Automation</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:99
-msgid "Video Rename"
+#: rapid/glade3/prefs.ui.h:82
+msgid "Unmount (\"eject\") device upon download completion"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:100
-msgid "Video backup folder name:"
+#: rapid/glade3/prefs.ui.h:83
+msgid "Start downloading at program startup"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:101
-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."
+#: rapid/glade3/prefs.ui.h:84
+msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:102
-msgid ""
-"When backing up, choose whether to overwrite a file on the backup device "
-"that has the same name, or skip backing it up."
+#: rapid/glade3/prefs.ui.h:85
+msgid "Exit program when download completes"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:103
-msgid ""
-"You can have your photos and videos backed up to multiple locations as they "
-"are downloaded, e.g. external hard drives."
+#: rapid/glade3/prefs.ui.h:86
+msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:104
-msgid "_Add..."
+#: rapid/glade3/prefs.ui.h:87
+msgid "Automatically rotate JPEG images"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:105
-msgid "_Clear Completed Downloads"
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:106
-msgid "_Device"
+#: rapid/glade3/prefs.ui.h:90
+msgid "Performance"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:107
-msgid "_Error Log"
+#: rapid/glade3/prefs.ui.h:91
+msgid "Generate thumbnails (slower)"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:108
-msgid "_File"
+#: rapid/glade3/prefs.ui.h:92
+msgid "Miscellaneous"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:109
-msgid "_Filename"
+#: rapid/glade3/prefs.ui.h:93
+msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:110
-msgid "_Get Help Online..."
+#: rapid/glade3/prefs.ui.h:94
+msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:111
-msgid "_Help"
+#: rapid/glade3/prefs.ui.h:95
+msgid "Add unique identifier"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:112
-msgid "_Make a Donation..."
+#: rapid/glade3/prefs.ui.h:96
+msgid "Skip download"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:113
-msgid "_Path"
+#: rapid/glade3/prefs.ui.h:97
+msgid ""
+"When a photo or video of the same name has already been downloaded, choose "
+"whether to skip downloading the file, or to add a unique indentifier."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:114
-msgid "_Preview"
+#: rapid/glade3/prefs.ui.h:98
+msgid ""
+"When backing up, choose whether to overwrite a file on the backup device "
+"that has the same name, or skip backing it up."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:115
-msgid "_Report a Problem..."
+#: rapid/glade3/prefs.ui.h:99
+msgid "Overwrite"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:116
-msgid "_Select"
+#: rapid/glade3/prefs.ui.h:100
+msgid "Skip"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:117
-msgid "_Size"
+#: rapid/glade3/prefs.ui.h:101
+msgid "Error Handling"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:118
-msgid "_Translate this Application..."
+#: rapid/glade3/about.ui.h:1
+msgid "Import your photos and videos efficiently and reliably"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:119
-msgid "_Type"
-msgstr ""
+#~ msgid "Resetting value to zero.\n"
+#~ msgstr "ری ست مقدار به صفر\n"
 
-#: rapid/glade3/rapid.glade.h:120
-msgid "_View"
-msgstr ""
+#~ msgid "Error in Image Rename preferences"
+#~ msgstr "خطای تغیر نام تصویر"
+
+#~ msgid "Error in Download Subfolder preferences"
+#~ msgstr "خطای ایجاد زیر پوشه دانلود"
+
+#~ msgid "Resetting to default values."
+#~ msgstr "مقدار دهی ثانویه مقادیر اولیه"
+
+#~ msgid "Select an image folder"
+#~ msgstr "یک پوشه عکس را انتخاب نمایید"
+
+#~ msgid "The subfolder preferences had some unnecessary values removed."
+#~ msgstr "تنظیمات زیرپوشه دارای تعدادی ارزش های غیر ضروری حذف شده است."
+
+#~ msgid ""
+#~ "The subfolder preferences entered are invalid and cannot be used.\n"
+#~ "They will be reset to their default values."
+#~ msgstr ""
+#~ "تنظیمات زیرپوشه وارد شده نامعتبر است و نمیتوان آنها را استفاده کرد.\n"
+#~ "آنها به مقادیر پیش فرض خود را مجددا تنظیم خواهند شد."
+
+#~ msgid "Select a folder in which to backup images"
+#~ msgstr "یک فولدر را برای گرفتن بک آپ عکس ها انتخاب نماید"
+
+#~ msgid ""
+#~ "\n"
+#~ "Please check preferences, restart the program, and try again."
+#~ msgstr ""
+#~ "\n"
+#~ "لطفا تنظیمات چک کنید ، برنامه را مجدد راه اندازی ، و دوباره سعی کنید."
+
+#~ msgid "There is an error in the program preferences."
+#~ msgstr "خطا در تنظیمات برنامه وجود دارد."
+
+#~ msgid "      "
+#~ msgstr "      "
diff --git a/po/fi.po b/po/fi.po
index a40645e..5829ed0 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,243 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-28 02:49-0600\n"
-"PO-Revision-Date: 2011-02-07 10:57+0000\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:16+0000\n"
 "Last-Translator: Toni Lähdekorpi <toni@lygon.net>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-20 22:12+0000\n"
-"X-Generator: Launchpad (build 12617)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:124 rapid/rapid.py:6468 rapid/glade3/rapid.glade.h:71
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Nopea kuvien lataus"
 
-#: rapid/rapid.py:461
-msgid "New York"
-msgstr "New York"
-
-#: rapid/rapid.py:462
-msgid "Manila"
-msgstr "Manila"
-
-#: rapid/rapid.py:462
-msgid "Prague"
-msgstr "Praha"
-
-#: rapid/rapid.py:462
-msgid "Helsinki"
-msgstr "Helsinki"
-
-#: rapid/rapid.py:462
-msgid "Wellington"
-msgstr "Wellington"
-
-#: rapid/rapid.py:463
-msgid "Tehran"
-msgstr "Teheran"
-
-#: rapid/rapid.py:463
-msgid "Kampala"
-msgstr "Guatemala"
-
-#: rapid/rapid.py:463
-msgid "Paris"
-msgstr "Pariisi"
-
-#: rapid/rapid.py:463
-msgid "Berlin"
-msgstr "Berliini"
-
-#: rapid/rapid.py:463
-msgid "Sydney"
-msgstr "Sydney"
-
-#: rapid/rapid.py:464
-msgid "Budapest"
-msgstr "Budapest"
-
-#: rapid/rapid.py:464
-msgid "Rome"
-msgstr "Rooma"
-
-#: rapid/rapid.py:464
-msgid "Moscow"
-msgstr "Moskova"
-
-#: rapid/rapid.py:464
-msgid "Delhi"
-msgstr "Delhi"
-
-#: rapid/rapid.py:464
-msgid "Warsaw"
-msgstr "Varsova"
-
-#: rapid/rapid.py:465
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: rapid/rapid.py:465
-msgid "Madrid"
-msgstr "Madrid"
-
-#: rapid/rapid.py:465
-msgid "Stockholm"
-msgstr "Tukholma"
-
-#: rapid/rapid.py:499
-msgid "Invalid Downloads Today value.\n"
-msgstr "Virheelliset lataukset tänään\n"
-
-#: rapid/rapid.py:500
-msgid "Resetting value to zero.\n"
-msgstr "Palautetaan arvo nollaan.\n"
-
-#: rapid/rapid.py:539
-msgid "'Start of day' preference value is corrupted.\n"
-msgstr "'Päivän alku'-asetuksen arvo on virheellinen.\n"
-
-#: rapid/rapid.py:540
-msgid "Resetting to midnight.\n"
-msgstr "Palautetaan keskiyöhön.\n"
-
-#: rapid/rapid.py:566
-msgid "Error in Photo Rename preferences"
-msgstr "Virhe kuvien uudelleennimeämisen määrityksissä"
-
-#: rapid/rapid.py:598 rapid/rapid.py:1720
-msgid "Sorry,these preferences contain an error:\n"
-msgstr "Anteeksi, näissä määrityksissä on virhe:\n"
-
-#: rapid/rapid.py:609
-msgid "Resetting to default values."
-msgstr "Palautetaan oletusarvot."
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:684 rapid/renamesubfolderprefs.py:198
-msgid "Job code"
-msgstr "Työkoodi"
-
-#: rapid/rapid.py:752
-msgid "Error in Video Rename preferences"
-msgstr "Virhe videoiden uudelleennimeämisen määrityksissä"
-
-#: rapid/rapid.py:770
-msgid "Error in Photo Download Subfolders preferences"
-msgstr "Virhe kuvien latauksen alikansion määrityksissä"
-
-#: rapid/rapid.py:787
-msgid "Error in Video Download Subfolders preferences"
-msgstr "Virhe videoiden latauksen alikansion määrityksissä"
-
-#: rapid/rapid.py:820 rapid/rapid.py:1551
-msgid "photos and videos"
-msgstr "kuvat ja videot"
-
-#: rapid/rapid.py:822 rapid/rapid.py:1561 rapid/rapid.py:1689
-msgid "photos"
-msgstr "kuvat"
-
-#: rapid/rapid.py:955
-msgid "Select a folder to download photos to"
-msgstr "Valitse kansio johon kuvat ladataan"
-
-#: rapid/rapid.py:973
-msgid "Select a folder to download videos to"
-msgstr "valitse johon videot ladataan"
-
-#: rapid/rapid.py:1055
-#, python-format
-msgid "Select a folder containing %(file_types)s"
-msgstr "valitse kansio joka sisältää %(file_types)s tiedostoja"
-
-#: rapid/rapid.py:1077
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
-msgstr "valitse kansio johon varmuuskopioidaan %(file_types)s tiedostoja"
-
-#. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:1158
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
-"name. Please use other renaming options.</i>"
-msgstr ""
-"<i><b>Varoitus:</b> Tiedostossa ei ole riittävästi metatietoja nimen "
-"luomiseksi. Käytä muita uudelleennimeämis valintoja.</i>"
-
-#: rapid/rapid.py:1194
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate "
-"subfolders. Please use other subfolder naming options.</i>"
-msgstr ""
-"<i><b>Varoitus:</b> Tiedostossa ei ole riittävästi metatietoja alikansioiden "
-"luomiseksi. Käytä muita alikansion nimeämisvalintoja.</i>"
-
-#. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:1198
-#, python-format
-msgid "<i>Example: %s</i>"
-msgstr "<i>Esimerkki: %s</i>"
-
-#: rapid/rapid.py:1224
-msgid ""
-"Downloads today value not updated, as a download is currently occurring"
-msgstr ""
-"Latauksia tänään arvoa ei päivitetty, koska lataus on edelleen kesken"
-
-#: rapid/rapid.py:1240
-msgid "Stored number value not updated, as a download is currently occurring"
-msgstr "Tallennettua numeroa ei päivitetty, koska lataus on edelleen kesken"
-
-#: rapid/rapid.py:1270
-#, python-format
-msgid ""
-"The %(filetype)s subfolder preferences had some unnecessary values removed."
-msgstr "%(filetype)s alikansioasetuksista poistettiin turhia arvoja."
-
-#. Preferences list is now empty
-#: rapid/rapid.py:1275
-#, python-format
-msgid ""
-"The %(filetype)s subfolder preferences entered are invalid and cannot be "
-"used.\n"
-"They will be reset to their default values."
-msgstr ""
-"Annetut alikansioasetukset %(filetype)s tiedostoille olivat väärät ja niitä "
-"ei voi käyttää.\n"
-"Asetukset palautetaan oletusarvoihin."
-
-#. check subfolder preferences for bad values
-#: rapid/rapid.py:1289 rapid/rapid.py:1563
-msgid "photo"
-msgstr "kuva"
-
-#: rapid/rapid.py:1290 rapid/rapid.py:1558
-msgid "video"
-msgstr "video"
-
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1527
-msgid "externaldrive1"
-msgstr "ulkoinenasema1"
-
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1529
-msgid "externaldrive2"
-msgstr "ulkoinenasema2"
-
-#: rapid/rapid.py:1553 rapid/rapid.py:1687
-msgid "photos or videos"
-msgstr "kuvat ja videot"
-
-#: rapid/rapid.py:1556
-msgid "videos"
-msgstr "videot"
-
-#: rapid/rapid.py:1568
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -252,1633 +31,1641 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:1570
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:1573
-#, python-format
-msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
-msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
-
-#: rapid/rapid.py:1580
+#: rapid/rapid.py:127
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/rapid.py:1608 rapid/rapid.py:2280
-msgid "subfolder and filename"
-msgstr "alikansio ja tiedstonimi"
+#. Device refers to a thing like a camera, memory card in its reader,
+#. external hard drive, Portable Storage Device, etc.
+#: rapid/rapid.py:162
+msgid "Device"
+msgstr "Laite"
 
-#: rapid/rapid.py:1610 rapid/rapid.py:2282
-msgid "filename"
-msgstr "tiedostonimi"
+#. Size refers to the total size of images on the device, typically in
+#. MB or GB
+#: rapid/rapid.py:180
+msgid "Size"
+msgstr "Koko"
 
-#: rapid/rapid.py:1612 rapid/rapid.py:2284
-msgid "subfolder"
-msgstr "alikansio"
+#: rapid/rapid.py:183
+msgid "Download Progress"
+msgstr "Latauksen edistyminen"
+
+#: rapid/rapid.py:343
+#, python-format
+msgid "%(device)s did not unmount"
+msgstr ""
 
 #. This refers to when a device like a hard drive is having its contents scanned,
 #. looking for photos or videos. It is visible initially in the progress bar for each device
 #. (which normally holds "x photos and videos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1703
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr "etsii..."
 
+#. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
 #: rapid/rapid.py:1818
-msgid "The following download path could not be created:\n"
-msgstr "Seuraavaa latauspolkua ei voitu luoda:\n"
+msgid "the root of the file system"
+msgstr ""
 
-#: rapid/rapid.py:1819
+#. message in dialog box which asks the user if they really want to be downloading from this location
+#: rapid/rapid.py:1822
 #, python-format
-msgid "%(path)s: "
-msgstr "%(path)s: "
-
-#: rapid/rapid.py:1820 rapid/rapid.py:1821 rapid/rapid.py:1836
-#: rapid/rapid.py:1837 rapid/rapid.py:2097 rapid/rapid.py:2100
-msgid "Download cannot proceed"
-msgstr "Latausta ei voida jatkaa"
-
-#: rapid/rapid.py:1834 rapid/rapid.py:5105
-msgid "There is an error in the program preferences."
-msgstr "Ohjelman asetuksissa on virhe."
+msgid "Downloading from %(location)s."
+msgstr ""
 
-#: rapid/rapid.py:1835
+#: rapid/rapid.py:1823
 msgid ""
-"\n"
-"Please check preferences, restart the program, and try again."
+"Do you really want to download from here? On some systems, scanning this "
+"location can take a very long time."
 msgstr ""
-"\n"
-"Ole hyvä ja tarkista asetukset, käynnistä ohjelma uudelleen ja koita "
-"uudestaan."
 
-#. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-#. It refers to the actual number of photos that can be copied. For example, the user might see the following:
-#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
-#. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:2008
-#, python-format
-msgid "%(number)s %(filetypes)s"
-msgstr "%(number)s %(filetypes)s"
-
-#. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
-#. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-#. to the user when they run the program, signifying the number of photos found, and the device they were found on.
-#. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
-#. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
-#. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:2019
-#, python-format
-msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
+msgid "Download"
 msgstr ""
-"Laitteiden haku on valmis: löytyi %(number)s %(filetypes)s, %(device)s "
-"laitteessa"
-
-#: rapid/rapid.py:2026
-#, python-format
-msgid "Device scan complete: no %(filetypes)s found on %(device)s"
-msgstr "Laite haku valmis: ei %(filetypes)s löytynyt %(device)s laitteesta"
-
-#. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:2047
-msgid "The device can now be safely removed"
-msgstr "Laite voidaan turvallisesti poistaa"
-
-#: rapid/rapid.py:2053
-#, python-format
-msgid "%(noFiles)s %(filetypes)s downloaded"
-msgstr "%(noFiles)s %(filetypes)s ladattu"
 
-#: rapid/rapid.py:2056
-#, python-format
-msgid "%(noFiles)s %(filetypes)s failed to download"
-msgstr "%(noFiles)s %(filetypes)s ei voitu ladata"
-
-#: rapid/rapid.py:2059 rapid/rapid.py:5901
-msgid "warnings"
-msgstr "varoitukset"
-
-#: rapid/rapid.py:2061 rapid/rapid.py:5905
-msgid "errors"
-msgstr "virheet"
-
-#: rapid/rapid.py:2091
-#, python-format
-msgid "Source: %s\n"
-msgstr "Lähde: %s\n"
-
-#: rapid/rapid.py:2093
-#, python-format
-msgid "Device: %s\n"
-msgstr "Laite: %s\n"
-
-#: rapid/rapid.py:2094
-#, python-format
-msgid "Destination: %s"
-msgstr "Kohde: %s"
-
-#: rapid/rapid.py:2095 rapid/rapid.py:2098
-msgid "Could not create temporary download directory"
-msgstr "Väliaikaista latauskansiota ei voitu luoda"
-
-#: rapid/rapid.py:2098
-msgid "Error:"
-msgstr "Virhe:"
-
-#: rapid/rapid.py:2122
-msgid "Backup path does not exist"
-msgstr "Varmuuskopiokansio ei ole olemassa"
-
-#: rapid/rapid.py:2123
-#, python-format
-msgid "The path %s could not be created"
-msgstr "%s kansiota ei voitu luoda"
-
-#: rapid/rapid.py:2124
-msgid "No backups can occur"
-msgstr "Varmuuskopioita ei pysty tekemään"
+#: rapid/rapid.py:2270
+msgid "Pause"
+msgstr ""
 
-#: rapid/rapid.py:2153
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"%(problem)s"
+"These download folders are invalid:\n"
+"%(folder1)s\n"
+"%(folder2)s"
 msgstr ""
-"Lähde: %(source)s\n"
-"Kohde: %(destination)s\n"
-"%(problem)s"
 
-#: rapid/rapid.py:2184 rapid/rapid.py:2530 rapid/rapid.py:2565
-#: rapid/rapid.py:2593 rapid/rapid.py:2624 rapid/rapid.py:2643
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
+"This download folder is invalid:\n"
+"%s"
 msgstr ""
-"Lähde: %(source)s\n"
-"Kohde: %(destination)s"
 
-#. hopefully inst will never be None, but just to be safe...
-#: rapid/rapid.py:2199
-msgid "Please check your system and try again."
-msgstr "Tarkista järjestelmäsi ja yritä uudelleen."
+#: rapid/rapid.py:2380
+msgid "Download cannot proceed"
+msgstr "Latausta ei voida jatkaa"
 
-#: rapid/rapid.py:2219
-msgid "Photos detected with the same filenames, but taken at different times"
-msgstr "Saman niminen kuva havaittu, mutta kuvat on otettu eri aikaan"
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
 
-#: rapid/rapid.py:2259
-msgid "Photo has already been downloaded"
-msgstr "Kuva on jo ladattu"
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "kuvat"
 
-#: rapid/rapid.py:2260 rapid/rapid.py:2659
-#, python-format
-msgid "Source: %(source)s"
-msgstr "Lähde: %(source)s"
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "videot"
 
-#. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:2458
-msgid "New day has started - resetting 'Downloads Today' sequence number"
-msgstr "Uusi päivä on alkanut - Palautetaan 'Latauksia Tänään' luku"
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr ""
 
-#: rapid/rapid.py:2529
-#, python-format
-msgid "Backup of %(file_type)s already exists"
-msgstr "%(file_type)s varmuuskopio on jo olemassa"
+#: rapid/rapid.py:2802
+msgid "About 1 second remaining"
+msgstr "Noin 1 sekunti jäljellä"
 
-#: rapid/rapid.py:2533
+#: rapid/rapid.py:2804
 #, python-format
-msgid "Backup %(file_type)s overwritten"
-msgstr "%(file_type)s Varmuuskopio ylikirjoitettiin"
+msgid "About %i seconds remaining"
+msgstr "Noin %i sekuntia jäljellä"
 
-#: rapid/rapid.py:2537
-#, python-format
-msgid "%(file_type)s not backed up to %(volume)s"
-msgstr "%(file_type)s-tiedostoja ei varmuuskopioitu kohteeseen %(volume)s"
+#: rapid/rapid.py:2806
+msgid "About 1 minute remaining"
+msgstr "Noin 1 minuutti jäljellä"
 
-#: rapid/rapid.py:2539
+#. 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:2811
 #, python-format
-msgid "%(file_type)s not backed up"
-msgstr "%(file_type)s ei varmuuskopioida"
+msgid "About %(minutes)i:%(seconds)02i minutes remaining"
+msgstr "Noin %(minutes)i:%(seconds)02i minuuttia jäljellä"
 
-#: rapid/rapid.py:2562 rapid/rapid.py:2590 rapid/rapid.py:2623
-#: rapid/rapid.py:2642
-msgid "Backing up error"
-msgstr "Varmuuskopiointi virhe"
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
+msgid "photos and videos"
+msgstr "kuvat ja videot"
 
-#: rapid/rapid.py:2563 rapid/rapid.py:2591
-#, python-format
-msgid "Destination directory could not be created: %(directory)s\n"
-msgstr "Kohdekansiota ei voitu luoda: %(directory)s\n"
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
+msgid "photos or videos"
+msgstr "kuvat ja videot"
 
-#: rapid/rapid.py:2567 rapid/rapid.py:2626
-#, python-format
-msgid "Error: %(inst)s"
-msgstr "Virhe: %(inst)s"
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
+msgid "video"
+msgstr "video"
 
-#: rapid/rapid.py:2568 rapid/rapid.py:2596 rapid/rapid.py:2627
-#: rapid/rapid.py:2646
-#, python-format
-msgid "The %(file_type)s was not backed up."
-msgstr "%(file_type)s ei varmuuskopioitu"
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
+msgid "photo"
+msgstr "kuva"
 
-#: rapid/rapid.py:2595 rapid/rapid.py:2645
+#: rapid/rapid.py:2872
 #, python-format
-msgid "Error: %(errno)s %(strerror)s"
-msgstr "Virhe: %(errno)s %(strerror)s"
+msgid "%(noFiles)s %(filetypes)s downloaded"
+msgstr "%(noFiles)s %(filetypes)s ladattu"
 
-#: rapid/rapid.py:2658
+#: rapid/rapid.py:2876
 #, python-format
-msgid "%(file_type)s could not be backed up"
-msgstr "%(file_type)s ei voitu varmuuskopioda"
-
-#: rapid/rapid.py:2661
-msgid "No suitable backup volume was found"
-msgstr "ei löydetty sopivaa varmuuskopiolaitetta"
+msgid "%(noFiles)s %(filetypes)s failed to download"
+msgstr "%(noFiles)s %(filetypes)s ei voitu ladata"
 
-#: rapid/rapid.py:2663
-msgid "A backup location was not found"
-msgstr "varmuuskopiosijaintia ei löytynyt"
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
+msgid "warnings"
+msgstr "varoitukset"
 
-#: rapid/rapid.py:2717
-#, python-format
-msgid "This device has no %(types_searched_for)s to download from."
-msgstr "Tällä laitteella ei ole %(types_searched_for)s ladattavaksi."
+#: rapid/rapid.py:2892
+msgid "All downloads complete"
+msgstr "Kaikki lataukset valmiita"
 
-#: rapid/rapid.py:2813
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
-msgid "Download has started from %s"
-msgstr "Lataus lähteestä %s on alkanut"
+msgid "%(number)s %(numberdownloaded)s"
+msgstr ""
 
-#: rapid/rapid.py:2817
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
-msgid "Attempting to download %s files"
-msgstr "Yritetään ladata %s tiedostoa"
+msgid "%(filetype)s downloaded"
+msgstr "%(filetype)s ladattu"
 
-#. reset the progress bar to update the status of this download attempt
-#: rapid/rapid.py:2849 rapid/rapid.py:2917
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
-msgid "%(number)s of %(total)s %(filetypes)s"
-msgstr "%(number)s/%(total)s %(filetypes)s"
+msgid "%(filetype)s failed to download"
+msgstr "%(filetype)s lataus ei onnistunut"
 
-#: rapid/rapid.py:2913
+#. e.g.: 3 of 205 photos and videos (202 remaining)
+#: rapid/rapid.py:2970
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr "%(number)s / %(total)s %(filetypes)s (%(remaining)s jäljellä)"
 
-#: rapid/rapid.py:2938 rapid/rapid.py:2942
-msgid "Could not delete photo or video from device"
-msgstr "videota tai kuvaa ei voitu poistaa laitteesta"
-
-#: rapid/rapid.py:2939
-#, python-format
-msgid ""
-"Photo: %(source)s\n"
-"Error: %(errno)s %(strerror)s"
-msgstr ""
-"Kuva: %(source)s\n"
-"Virhe: %(errno)s %(strerror)s"
-
-#: rapid/rapid.py:2943
+#. e.g.: 205 of 205 photos and videos
+#: rapid/rapid.py:2977
 #, python-format
-msgid "Photo: %(source)s"
-msgstr "Kuva: %(source)s"
-
-#: rapid/rapid.py:2945
-#, python-format
-msgid "Deleted %(number)i %(filetypes)s from device"
-msgstr "poistettiin %(number)i %(filetypes)s laitteesta"
-
-#: rapid/rapid.py:2958
-#, python-format
-msgid "Download complete from %s"
-msgstr "Lataus lähteestä %s valmis"
-
-#. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:3073 rapid/rapid.py:3542
-msgid "Device"
-msgstr "Laite"
-
-#. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:3078 rapid/rapid.py:3531
-msgid "Size"
-msgstr "Koko"
-
-#: rapid/rapid.py:3081
-msgid "Download Progress"
-msgstr "Latauksen edistyminen"
-
-#: rapid/rapid.py:3169
-msgid "Downloading From Cameras"
-msgstr "Lataa kameroista"
-
-#: rapid/rapid.py:3175
-msgid "Downloading directly from a camera may work poorly or not at all"
-msgstr "Lataa suoraan kamerasta. Voi toimia huonosti tai ei ollenkaan"
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr "%(number)s/%(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3176
-msgid ""
-"Downloading from a card reader always works and is generally much faster. It "
-"is strongly recommended to use a card reader."
+#: rapid/rapid.py:3331
+msgid "From"
 msgstr ""
-"Lataaminen muistikortinlukijasta toimii aina ja on yleisesti paljon "
-"nopeampaa. On suositeltavaa käyttää muistikortinlukijaa."
 
-#: rapid/rapid.py:3190
-msgid "_Show this message again"
-msgstr "_Näytä tämä viesti uudestaan"
-
-#: rapid/rapid.py:3225
-msgid "Device Detected"
-msgstr "Laite havaittu"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3234
-msgid ""
-"Should this device or partition be used to download photos or videos from?"
-msgstr "Tulisiko tätä laitetta tai osiota käyttää kuvalaitteena?"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3253
-msgid "_Remember this choice"
-msgstr "_Muista tämä valinta"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3290
-#, python-format
-msgid "%s selected for downloading from"
-msgstr "%s valittu ladattavaksi"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3293
-msgid "This device or partition will always be used to download from"
-msgstr "Tätä laitetta tai osiota tullaan aina käyttämään kuvien lataamiseen"
+#: rapid/rapid.py:3339
+msgid "Auto Detect"
+msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3296
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
-msgid "%s rejected as a download device"
-msgstr "%s laitetta ei hyväksytty latauslaitteeksi"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3299
-msgid "This device or partition will never be used to download from"
-msgstr "Tästä laitteesta tai osiosta ei ladata koskaan"
-
-#: rapid/rapid.py:3306
-msgid "Remove all Job Codes?"
-msgstr "Poista kaikki työkoodit?"
-
-#: rapid/rapid.py:3323
-msgid "Should all Job Codes be removed?"
-msgstr "Tulisiko kaikki työkoodit poistaa?"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3351
-msgid "Enter a Job Code"
-msgstr "Syöta työkoodi"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3370
-msgid "Enter a new Job Code, or select a previous one"
-msgstr "Syötä työkoodi tai valitse edellisistä"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3373
-msgid "Enter a new Job Code"
-msgstr "Syötä uusi työkoodi"
-
-#: rapid/rapid.py:3378 rapid/rapid.py:4640
-msgid "Job Code:"
-msgstr "Työkoodi:"
-
-#: rapid/rapid.py:3425
-msgid "Job Code entered"
-msgstr "Työkoodi syötetty"
-
-#: rapid/rapid.py:3427
-msgid "Job Code not entered"
-msgstr "Työkoodia ei annettu"
+msgid "Select a folder containing %(file_types)s"
+msgstr "valitse kansio joka sisältää %(file_types)s tiedostoja"
 
-#: rapid/rapid.py:3477
-msgid "Status"
-msgstr "Tila"
+#: rapid/rapid.py:3384
+msgid "Copy"
+msgstr ""
 
-#: rapid/rapid.py:3485
-msgid "Type"
-msgstr "Tyyppi"
+#: rapid/rapid.py:3397
+msgid "Move"
+msgstr ""
 
-#: rapid/rapid.py:3494 rapid/rapid.py:5067 rapid/rapid.py:5069
-msgid "Photo"
-msgstr "Kuva"
+#: rapid/rapid.py:3419
+msgid "To"
+msgstr ""
 
-#: rapid/rapid.py:3496
-msgid "File"
-msgstr "Tiedosto"
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
+msgid "Photos:"
+msgstr "Kuvat:"
 
-#: rapid/rapid.py:3511
-msgid "Job Code"
-msgstr "Työkoodi"
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
+msgid "Select a folder to download photos to"
+msgstr "Valitse kansio johon kuvat ladataan"
 
-#: rapid/rapid.py:3521
-msgid "Date"
-msgstr "Päiväys"
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
+msgid "Videos:"
+msgstr "Videot:"
 
-#: rapid/rapid.py:3553 rapid/renamesubfolderprefs.py:194
-msgid "Filename"
-msgstr "Tiedostonimi"
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
+msgid "Select a folder to download videos to"
+msgstr "valitse johon videot ladataan"
 
-#: rapid/rapid.py:3564
-msgid "Path"
-msgstr "Polku"
+#: rapid/rapid.py:3650
+msgid "and"
+msgstr "ja"
 
-#: rapid/rapid.py:3974
-#, python-format
-msgid "%(filetype)s was downloaded successfully"
-msgstr "%(filetype)s ladattiin onnistuneesti"
+#: rapid/rapid.py:3655
+msgid "Using backup devices"
+msgstr "Käyttää varmuuskopiolaitteita"
 
-#: rapid/rapid.py:3976
-#, python-format
-msgid "%(filetype)s was not downloaded"
-msgstr "%(filetype)s ei ladattu"
+#: rapid/rapid.py:3657
+msgid "Using backup device"
+msgstr "Käyttää varmuuskopiolaitetta"
 
-#: rapid/rapid.py:3978
-#, python-format
-msgid "%(filetype)s was downloaded with warnings"
-msgstr "%(filetype)s ladattiin, mutta varoitusten kera"
+#: rapid/rapid.py:3659
+msgid "No backup devices detected"
+msgstr "Varmuuskopiolaitetta ei löytynyt"
 
-#: rapid/rapid.py:3980
-#, python-format
-msgid "%(filetype)s was downloaded but there were problems backing up"
-msgstr "%(filetype)s ladattiin, mutta varmuuskopioinnissa oli ongelmia"
+#: rapid/rapid.py:3686
+msgid "Free space:"
+msgstr ""
 
-#: rapid/rapid.py:3982
+#. (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:3698
 #, python-format
-msgid "%(filetype)s was neither downloaded nor backed up"
-msgstr "%(filetype)s ei ladattu eikä varmuuskopioitu"
+msgid "(%(file_type)s)"
+msgstr ""
 
-#: rapid/rapid.py:3984
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#: rapid/rapid.py:3702
 #, python-format
-msgid "%(filetype)s is ready to be downloaded"
-msgstr "%(filetype)s on valmiina ladattavaksi"
+msgid "%(free)s %(file_type)s"
+msgstr ""
 
-#: rapid/rapid.py:3986
-#, python-format
-msgid "%(filetype)s is about to be downloaded"
-msgstr "%(filetype)s ladataan"
+#. 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:3707
+msgid "; "
+msgstr ""
 
-#: rapid/rapid.py:3988
-#, python-format
-msgid "%(filetype)s will be downloaded with warnings"
-msgstr "%(filetype)s ladataan, mutta varoituksien kera"
+#. 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:3712
+msgid "."
+msgstr ""
 
-#: rapid/rapid.py:3990
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#. e.g. 14.7GB available
+#: rapid/rapid.py:3718
 #, python-format
-msgid "%(filetype)s cannot be downloaded"
-msgstr "%(filetype)s ei voida ladata"
-
-#: rapid/rapid.py:4662
-msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
+msgid "%(free)s free"
 msgstr ""
-"Syötä uusi työkoodi ja paina Enter tai valitse olemassa oleva työkoodi"
 
-#: rapid/rapid.py:5034
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3726
 #, python-format
-msgid "%(free)s available"
-msgstr "%(free)s vapaana"
+msgid "Backing up photos and videos to %(path)s"
+msgstr ""
 
 #. user manually specified backup location
-#: rapid/rapid.py:5040
+#: rapid/rapid.py:3729
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Varmuuskopioidaan kohteeseen %(path)s"
 
-#: rapid/rapid.py:5045
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3732
 #, python-format
-msgid "%(freespace)s. %(backuppaths)s."
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr ""
 
-#: rapid/rapid.py:5054
+#: rapid/rapid.py:3739
 #, python-format
-msgid ""
-"Sorry, this device location does not exist:\n"
-"%(path)s\n"
-"\n"
-"Please resolve the problem, or modify your preferences."
+msgid "%(freespace)s. %(backuppaths)s."
+msgstr ""
+
+#: rapid/rapid.py:3768
+msgid "Program preferences are invalid"
 msgstr ""
-"Tätä laitteen sijaintia ei ole:\n"
-"%(path)s"
 
-#: rapid/rapid.py:5058
-msgid "Problem with Device Location Folder"
-msgstr "Ongelma laitteen sijaintikansiossa"
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
+msgid "Photo"
+msgstr "Kuva"
 
-#: rapid/rapid.py:5067
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:5074
-#, python-format
-msgid "The %(file_type)s Download Folder does not exist.\n"
-msgstr "%(file_type)s-latauskansiota ei ole olemassa.\n"
-
-#: rapid/rapid.py:5083
+#: rapid/rapid.py:3921
 #, python-format
-msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
-msgstr ""
-"%(file_type)s-latauskansio on olemassa, mutta siihen ei voida kirjoittaa.\n"
-
-#: rapid/rapid.py:5088
-msgid ""
-"Sorry, problems were encountered with your download folders. Please fix the "
-"problems or modify the preferences.\n"
-"\n"
+msgid "%(file_type)s download folder does not exist"
 msgstr ""
-"Anteeksi, ongelmia latauskansiosi kanssa. Ole hyvä ja korjaa ongelmat tai "
-"muokkaa määrityksiä.\n"
-"\n"
-
-#: rapid/rapid.py:5091
-msgid "Problem with Download Folder"
-msgstr "Ongelma Latauskansiossa"
-
-#: rapid/rapid.py:5093
-msgid "Problem with Download Folders"
-msgstr "Ongelma latauskansioiden kanssa"
-
-#: rapid/rapid.py:5106
-msgid "Some preferences will be reset."
-msgstr "Jotkin asetukset palautetaan."
-
-#: rapid/rapid.py:5139
-msgid "Displaying warning about downloading directly from camera"
-msgstr "Näytetään varoitus ladattaessa suoraan kamerasta"
-
-#: rapid/rapid.py:5149
-#, python-format
-msgid "Prompting whether to use %s"
-msgstr "Kysyy tulisiko käyttää laitetta %s"
-
-#: rapid/rapid.py:5176
-msgid "Prompting for Job Code"
-msgstr "Kysyy työkoodia"
-
-#: rapid/rapid.py:5180
-msgid "Already prompting for Job Code, do not prompt again"
-msgstr "Työkoodia pyydetään jo, älä pyydä uudestaan"
-
-#: rapid/rapid.py:5197
-msgid "Starting downloads"
-msgstr "Käynnistetään latauksia"
 
-#. autostart is true
-#: rapid/rapid.py:5201
-msgid "Starting downloads that have been waiting for a Job Code"
-msgstr "Työkoodia odottaneet lataukset käynnistetään"
-
-#: rapid/rapid.py:5248
-#, python-format
-msgid "Creating photo download folder %(folder)s"
-msgstr "Luodaan kuvien latauskansio %(folder)s"
-
-#: rapid/rapid.py:5253
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
-msgid "Failed to create default photo download folder %(folder)s"
-msgstr "Kuvien oletuslatauskansion %(folder)s luonti epäonnistui"
+msgid "Folder: %s"
+msgstr ""
 
-#: rapid/rapid.py:5257
+#: rapid/rapid.py:3935
 #, python-format
-msgid "Creating video download folder %(folder)s"
-msgstr "Luodaan videoiden latauskansio %(folder)s"
+msgid "%(file_type)s download folder is invalid"
+msgstr ""
 
-#: rapid/rapid.py:5262
+#: rapid/rapid.py:3948
 #, python-format
-msgid "Failed to create default video download folder %(folder)s"
-msgstr "Videolatausten oletuskansion %(folder)s luonti epäonnistui"
+msgid "%(file_type)s download folder is not writable"
+msgstr ""
 
-#: rapid/rapid.py:5287
-msgid ""
-"A newer version of this program was previously run on this computer.\n"
-"\n"
+#: rapid/rapid.py:4034
+msgid "Thumbnails"
 msgstr ""
-"Ohjelman uudempaa versiota on käytetty tässä tietokoneessa.\n"
-"\n"
 
-#: rapid/rapid.py:5289
+#. 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:4089
+#, python-format
 msgid ""
-"Program preferences appear to be valid, but please check them to ensure "
-"correct operation."
+"display program information on the command line as the program runs "
+"(default: %default)"
 msgstr ""
-"Ohjelma on kelpaava, mutta ole hyvä ja tarkista että ohjelma toimii oikein."
+"näytä ohjelman tiedot komentorivillä kun ohjelma käynnistetään (oletus: "
+"%default)"
 
-#: rapid/rapid.py:5291
-msgid "Sorry, some preferences are invalid and will be reset."
-msgstr ""
-"Anteeksi, jotkin asetukset ovat virheellisiä ja ne palautetaan "
-"oletusarvoihin."
+#: rapid/rapid.py:4090
+msgid "display debugging information when run from the command line"
+msgstr "näytä vianhakutietoja suorittaessa komentoriviltä"
 
-#: rapid/rapid.py:5292
-msgid "Warning:"
-msgstr "Varoitus:"
+#: rapid/rapid.py:4091
+msgid "only output errors to the command line"
+msgstr "tulosta vain virheet komentoriville"
 
-#: rapid/rapid.py:5297
-msgid ""
-"This version of the program is newer than the previously run version. "
-"Checking preferences."
+#. image file extensions are recognized RAW files plus TIFF and JPG
+#: rapid/rapid.py:4093
+msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
-"Tämä ohjelma on uudempi kuin aikaisemmin käytetty. Tarkista asetukset."
-
-#: rapid/rapid.py:5304
-msgid "Preferences were modified."
-msgstr "Asetuksia on muokattu."
+"listaa kuva- ja videotiedostopäätteitä joita ohjelma tunnistaa ja poistu"
 
-#: rapid/rapid.py:5305
+#: rapid/rapid.py:4095
 msgid ""
-"This version of the program uses different preferences than the old version. "
-"Your preferences have been updated.\n"
-"\n"
-"Please check them to ensure correct operation."
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
 msgstr ""
-"Tämä ohjelmaversio käyttää eri asetuksia kuin vanha versio. Asetuksesi on "
-"päivitettu.\n"
-"\n"
-"Ole hyvä ja tarkista ne varmistaaksesi ohjelman toiminta."
-
-#: rapid/rapid.py:5309
-msgid "No preferences needed to be changed."
-msgstr "Asetuksia ei tarvinnut muuttaa."
 
-#: rapid/rapid.py:5311
+#: rapid/rapid.py:4096
 msgid ""
-"This version of the program uses different preferences than the old version. "
-"Some of your previous preferences were invalid, and could not be updated. "
-"They will be reset."
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
 msgstr ""
-"Tämä ohjelmaversio käyttää eri asetuksia kuin vanha versio. Jotkin entisistä "
-"asetuksistasi olivat virheellisiä ja niitä ei voitu päivittää. Ne "
-"palautetaan oletuksiin."
-
-#: rapid/rapid.py:5321
-msgid "Problem using pynotify."
-msgstr "Ongelmia pynotifyn käytössä."
 
-#: rapid/rapid.py:5337
-msgid "Failed to receive pynotify server capabilities."
-msgstr "Ei saanut pynotify-palvelimen ominaisuuksia."
+#: rapid/rapid.py:4097
+msgid "reset all program settings and preferences and exit"
+msgstr "tyhjennä kaikki ohjelman asetukset ja määritykset, ja poistu"
 
-#: rapid/rapid.py:5348
+#: rapid/rapid.py:4110
 msgid ""
-"Warning: desktop environment notification server is incorrectly configured."
-msgstr "Varoitus: Työpöytäympäristön ilmoituspalvelu on väärin asennettu."
-
-#: rapid/rapid.py:5396
-msgid "and"
-msgstr "ja"
-
-#: rapid/rapid.py:5401
-msgid "Using backup devices"
-msgstr "Käyttää varmuuskopiolaitteita"
-
-#: rapid/rapid.py:5403
-msgid "Using backup device"
-msgstr "Käyttää varmuuskopiolaitetta"
-
-#: rapid/rapid.py:5405
-msgid "No backup devices detected"
-msgstr "Varmuuskopiolaitetta ei löytynyt"
-
-#: rapid/rapid.py:5455 rapid/rapid.py:5617
-#, python-format
-msgid "Device %(device)s (%(path)s) ignored"
-msgstr "Laite %(device)s (%(path)s) ohitettu"
+"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:5576
+#: rapid/rapid.py:4133
 #, python-format
-msgid "Detected %(device)s with path %(path)s"
-msgstr "Löytyi %(device)s laitetta polusta %(path)s"
-
-#: rapid/rapid.py:5580
-msgid "Automatically start download is true"
-msgstr "Automaattinen latauksen aloitus on päällä"
+msgid "and %s"
+msgstr "ja %s"
 
-#: rapid/rapid.py:5582
-msgid "Automatically start download is false"
-msgstr "Automaattinen latauksen aloitus on pois päältä"
+#: rapid/rapid.py:4141
+msgid "All settings and preferences have been reset"
+msgstr "Kaikki asetukset ja määritykset tyhjennetty"
 
-#: rapid/rapid.py:5635
-msgid "Using manually specified path"
-msgstr "Käytetään käsin valittua polkua"
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
+msgid "Backing up error"
+msgstr "Varmuuskopiointi virhe"
 
-#. the user is trying to backup to a device that is currently being downloaded from..... we don't normally allow that, but what to do?
-#: rapid/rapid.py:5703
+#: rapid/backupfile.py:151
 #, python-format
-msgid "Warning: backup device %(device)s is currently being downloaded from"
-msgstr "Varoitus: varmuuskopiolaitetta %(device)s käytetään lataamiseen"
-
-#: rapid/rapid.py:5719
-msgid "D_ownload Selected"
-msgstr "Lataa _valitut"
-
-#: rapid/rapid.py:5822 rapid/rapid.py:5873
-msgid "All downloads complete"
-msgstr "Kaikki lataukset valmiita"
-
-#: rapid/rapid.py:5837
-msgid "MB/s"
-msgstr "Mt/s"
-
-#: rapid/rapid.py:5847
-msgid "About 1 second remaining"
-msgstr "Noin 1 sekunti jäljellä"
+msgid "Destination directory could not be created: %(directory)s\n"
+msgstr "Kohdekansiota ei voitu luoda: %(directory)s\n"
 
-#: rapid/rapid.py:5849
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
-msgid "About %i seconds remaining"
-msgstr "Noin %i sekuntia jäljellä"
-
-#: rapid/rapid.py:5851
-msgid "About 1 minute remaining"
-msgstr "Noin 1 minuutti jäljellä"
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"Lähde: %(source)s\n"
+"Kohde: %(destination)s"
 
-#. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
-#. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
-#. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:5856
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
-msgid "About %(minutes)i:%(seconds)02i minutes remaining"
-msgstr "Noin %(minutes)i:%(seconds)02i minuuttia jäljellä"
+msgid "Error: %(inst)s"
+msgstr "Virhe: %(inst)s"
 
-#: rapid/rapid.py:5876 rapid/rapid.py:5882 rapid/rapid.py:5888
-#: rapid/rapid.py:5894 rapid/rapid.py:5899 rapid/rapid.py:5903
+#: rapid/backupfile.py:163
 #, python-format
-msgid "%(number)s %(numberdownloaded)s"
-msgstr ""
+msgid "Backup %(file_type)s overwritten"
+msgstr "%(file_type)s Varmuuskopio ylikirjoitettiin"
 
-#: rapid/rapid.py:5878 rapid/rapid.py:5890
+#: rapid/backupfile.py:166
 #, python-format
-msgid "%(filetype)s downloaded"
-msgstr "%(filetype)s ladattu"
+msgid "%(file_type)s not backed up"
+msgstr "%(file_type)s ei varmuuskopioida"
 
-#: rapid/rapid.py:5884 rapid/rapid.py:5896
+#: rapid/backupfile.py:168
 #, python-format
-msgid "%(filetype)s failed to download"
-msgstr "%(filetype)s lataus ei onnistunut"
-
-#: rapid/rapid.py:6070
-msgid "_Resume"
-msgstr "_Jatka"
-
-#: rapid/rapid.py:6073
-msgid "_Download All"
-msgstr "L_ataa kaikki"
-
-#. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:6082
-msgid "_Pause"
-msgstr "_Keskeytä"
-
-#: rapid/rapid.py:6194
-msgid "Download device settings preferences were changed."
-msgstr "Latauslaiteasetuksia on muutettu."
-
-#: rapid/rapid.py:6206
-msgid "Backup preferences were changed."
-msgstr "Varmuuskopiointi asetuksia muutettiin"
-
-#: rapid/rapid.py:6212
-msgid "Subfolder and filename preferences were changed."
-msgstr "Alikansio ja tiedostonimiasetuksia on muutettu."
-
-#: rapid/rapid.py:6223
-msgid "Download folder preferences were changed."
-msgstr "Latauskansion asetuksia muutettiin"
-
-#: rapid/rapid.py:6422
-msgid "Goodbye"
-msgstr "Näkemiin"
+msgid "Backup of %(file_type)s already exists"
+msgstr "%(file_type)s varmuuskopio on jo olemassa"
 
-#. 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:6433
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
-"display program information on the command line as the program runs "
-"(default: %default)"
+"%(problem)s\n"
+"File: %(file)s"
 msgstr ""
-"näytä ohjelman tiedot komentorivillä kun ohjelma käynnistetään (oletus: "
-"%default)"
-
-#: rapid/rapid.py:6434
-msgid "display debugging information when run from the command line"
-msgstr "näytä vianhakutietoja suorittaessa komentoriviltä"
-
-#: rapid/rapid.py:6435
-msgid "only output errors to the command line"
-msgstr "tulosta vain virheet komentoriville"
 
-#. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:6437
-msgid "list photo and video file extensions the program recognizes and exit"
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
 msgstr ""
-"listaa kuva- ja videotiedostopäätteitä joita ohjelma tunnistaa ja poistu"
-
-#: rapid/rapid.py:6438
-msgid "reset all program settings and preferences and exit"
-msgstr "tyhjennä kaikki ohjelman asetukset ja määritykset, ja poistu"
-
-#: rapid/rapid.py:6452
-msgid "Photos:"
-msgstr "Kuvat:"
-
-#: rapid/rapid.py:6452
-msgid "Videos:"
-msgstr "Videot:"
-
-#: rapid/rapid.py:6457
-#, python-format
-msgid "and %s"
-msgstr "ja %s"
 
-#: rapid/rapid.py:6465
-msgid "All settings and preferences have been reset"
-msgstr "Kaikki asetukset ja määritykset tyhjennetty"
+#: rapid/device.py:80
+msgid "Device Detected"
+msgstr "Laite havaittu"
 
-#. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:6469 rapid/rapid.py:6470 rapid/rapid.py:6472
-#: rapid/rapid.py:6477 rapid/rapid.py:6481
-msgid "Using"
-msgstr "Käyttäen"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/device.py:89
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
+msgstr "Tulisiko tätä laitetta tai osiota käyttää kuvalaitteena?"
 
-#: rapid/rapid.py:6474
-msgid "\n"
-msgstr "\n"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/device.py:108
+msgid "_Remember this choice"
+msgstr "_Muista tämä valinta"
 
-#. this application is already running
-#: rapid/rapid.py:6498
-#, python-format
-msgid "%s is already running"
-msgstr "%s on jo käynnissä"
+#: rapid/downloadtracker.py:299
+msgid "MB/s"
+msgstr "Mt/s"
 
-#: rapid/renamesubfolderprefs.py:192
+#: rapid/generatenameconfig.py:151
 msgid "Date time"
 msgstr "Ajankohta"
 
-#: rapid/renamesubfolderprefs.py:193
+#: rapid/generatenameconfig.py:152
 msgid "Text"
 msgstr "Teksti"
 
-#: rapid/renamesubfolderprefs.py:195
+#: rapid/generatenameconfig.py:153
+msgid "Filename"
+msgstr "Tiedostonimi"
+
+#: rapid/generatenameconfig.py:154
 msgid "Metadata"
 msgstr "Metatieto"
 
-#: rapid/renamesubfolderprefs.py:196
+#: rapid/generatenameconfig.py:155
 msgid "Sequences"
 msgstr "Numeroinnit"
 
-#: rapid/renamesubfolderprefs.py:199
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/generatenameconfig.py:157 rapid/preferencesdialog.py:577
+msgid "Job code"
+msgstr "Työkoodi"
+
+#: rapid/generatenameconfig.py:158
 msgid "Image date"
 msgstr "Kuvan päivämäärä"
 
-#: rapid/renamesubfolderprefs.py:200
+#: rapid/generatenameconfig.py:159
 msgid "Video date"
 msgstr "Videon päivämäärä"
 
-#: rapid/renamesubfolderprefs.py:201
+#: rapid/generatenameconfig.py:160
 msgid "Today"
 msgstr "Tänään"
 
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/generatenameconfig.py:161
 msgid "Yesterday"
 msgstr "Huomenna"
 
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/renamesubfolderprefs.py:204
+#: rapid/generatenameconfig.py:163
 msgid "Download time"
 msgstr "Latausaika"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:206
+#: rapid/generatenameconfig.py:165
 msgid "Name + extension"
 msgstr "Nimi + pääte"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:208
+#: 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/renamesubfolderprefs.py:210
+#: rapid/generatenameconfig.py:169
 msgid "Extension"
 msgstr "Tiedostopääte"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:212
+#: rapid/generatenameconfig.py:171
 msgid "Image number"
 msgstr "Kuvan numero"
 
-#: rapid/renamesubfolderprefs.py:213
+#: rapid/generatenameconfig.py:172
 msgid "Video number"
 msgstr "Videon numero"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:215
+#: rapid/generatenameconfig.py:174
 msgid "Aperture"
 msgstr "Aukko"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:217
+#: rapid/generatenameconfig.py:176
 msgid "ISO"
 msgstr "Herkkyys"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:219
+#: rapid/generatenameconfig.py:178
 msgid "Exposure time"
 msgstr "Valotusaika"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:221
+#: rapid/generatenameconfig.py:180
 msgid "Focal length"
 msgstr "Polttoväli"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:223
+#: rapid/generatenameconfig.py:182
 msgid "Camera make"
 msgstr "Kameran merkki"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:225
+#: rapid/generatenameconfig.py:184
 msgid "Camera model"
 msgstr "Kameran malli"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:227
+#: rapid/generatenameconfig.py:186
 msgid "Short camera model"
 msgstr "Lyhyt kameramalli"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:229
+#: rapid/generatenameconfig.py:188
 msgid "Hyphenated short camera model"
 msgstr "Tavutettu lyhyt kameran malli"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:231
+#: rapid/generatenameconfig.py:190
 msgid "Serial number"
 msgstr "Sarjanumero"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:233
+#: rapid/generatenameconfig.py:192
 msgid "Shutter count"
 msgstr "Suljinlaskuri"
 
+#. File number currently refers to the Exif value Exif.Canon.FileNumber
+#: rapid/generatenameconfig.py:194
+msgid "File number"
+msgstr ""
+
+#. Only the folder component of the Exif.Canon.FileNumber value
+#: rapid/generatenameconfig.py:196
+msgid "Folder only"
+msgstr ""
+
+#. The folder and file component of the Exif.Canon.FileNumber value
+#: rapid/generatenameconfig.py:198
+msgid "Folder and file"
+msgstr ""
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:235
+#: rapid/generatenameconfig.py:200
 msgid "Owner name"
 msgstr "Omistajan nimi"
 
-#: rapid/renamesubfolderprefs.py:236
+#: rapid/generatenameconfig.py:201
 msgid "Codec"
 msgstr "Koodekki"
 
-#: rapid/renamesubfolderprefs.py:237
+#: rapid/generatenameconfig.py:202
 msgid "Width"
 msgstr "Leveys"
 
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/generatenameconfig.py:203
 msgid "Height"
 msgstr "Korkeus"
 
-#: rapid/renamesubfolderprefs.py:239
+#: rapid/generatenameconfig.py:204
 msgid "Length"
 msgstr "Pituus"
 
-#: rapid/renamesubfolderprefs.py:240
+#: rapid/generatenameconfig.py:205
 msgid "Frames Per Second"
 msgstr "Kuvataajuus"
 
+#: rapid/generatenameconfig.py:206
+msgid "Artist"
+msgstr ""
+
+#: 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/renamesubfolderprefs.py:242
+#: rapid/generatenameconfig.py:209
 msgid "Downloads today"
 msgstr "Latauksia tänään"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/generatenameconfig.py:211
 msgid "Session number"
 msgstr "Istuntonumero"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/generatenameconfig.py:213
 msgid "Subfolder number"
 msgstr "Alikansion numero"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/generatenameconfig.py:215
 msgid "Stored number"
 msgstr "Tallennettu numero"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:250
+#: rapid/generatenameconfig.py:217
 msgid "Sequence letter"
 msgstr "Kirjainsarja"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:252
+#: rapid/generatenameconfig.py:219
 msgid "All digits"
 msgstr "Kaikki numerot"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:254
+#: rapid/generatenameconfig.py:221
 msgid "Last digit"
 msgstr "Viimeinen numero"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:256
+#: rapid/generatenameconfig.py:223
 msgid "Last 2 digits"
 msgstr "Kaksi viimeistä numeroa"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:258
+#: rapid/generatenameconfig.py:225
 msgid "Last 3 digits"
 msgstr "Kolme viimeistä numeroa"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:260
+#: rapid/generatenameconfig.py:227
 msgid "Last 4 digits"
 msgstr "Neljä viimeistä numeroa"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:262
+#: rapid/generatenameconfig.py:229
 msgid "Original Case"
 msgstr "Alkuperäinen kirjoitusasu"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:264
+#: rapid/generatenameconfig.py:231
 msgid "UPPERCASE"
 msgstr "ISOT KIRJAIMET"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:266
+#: rapid/generatenameconfig.py:233
 msgid "lowercase"
 msgstr "pienet kirjaimet"
 
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/generatenameconfig.py:234
 msgid "One digit"
 msgstr "Yksi numero"
 
-#: rapid/renamesubfolderprefs.py:268
+#: rapid/generatenameconfig.py:235
 msgid "Two digits"
 msgstr "Kaksi numeroa"
 
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/generatenameconfig.py:236
 msgid "Three digits"
 msgstr "Kolme numeroa"
 
-#: rapid/renamesubfolderprefs.py:270
+#: rapid/generatenameconfig.py:237
 msgid "Four digits"
 msgstr "Neljä numeroa"
 
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/generatenameconfig.py:238
 msgid "Five digits"
 msgstr "Viisi numeroa"
 
-#: rapid/renamesubfolderprefs.py:272
+#: rapid/generatenameconfig.py:239
 msgid "Six digits"
 msgstr "Kuusi numeroa"
 
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/generatenameconfig.py:240
 msgid "Seven digits"
 msgstr "Seitsemän numeroa"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/generatenameconfig.py:242
 msgid "Subseconds"
 msgstr "sekunnin osat"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/generatenameconfig.py:244
 msgid "YYYYMMDD"
 msgstr "VVVVKKPP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/generatenameconfig.py:246
 msgid "YYYY-MM-DD"
 msgstr "VVVV-KK-PP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/generatenameconfig.py:248
 msgid "YYMMDD"
 msgstr "VVKKPP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/generatenameconfig.py:250
 msgid "YY-MM-DD"
 msgstr "VV-KK-PP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/generatenameconfig.py:252
 msgid "MMDDYYYY"
 msgstr "KKPPVVVV"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/generatenameconfig.py:254
 msgid "MMDDYY"
 msgstr "KKPPVV"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/generatenameconfig.py:256
 msgid "MMDD"
 msgstr "KKPP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/generatenameconfig.py:258
 msgid "DDMMYYYY"
 msgstr "PPKKVVVV"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
+#: rapid/generatenameconfig.py:260
 msgid "DDMMYY"
 msgstr "PPKKVV"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:295
+#: rapid/generatenameconfig.py:262
 msgid "YYYY"
 msgstr "VVVV"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:297
+#: rapid/generatenameconfig.py:264
 msgid "YY"
 msgstr "VV"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:299
+#: rapid/generatenameconfig.py:266
 msgid "MM"
 msgstr "KK"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:301
+#: rapid/generatenameconfig.py:268
 msgid "DD"
 msgstr "PP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:303
+#: 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 "hhmmss"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:305
+#: 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/renamesubfolderprefs.py:307
+#: 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/renamesubfolderprefs.py:309
+#: 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/renamesubfolderprefs.py:311
+#: rapid/generatenameconfig.py:282
 msgid "HH"
 msgstr "TT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:313
+#: rapid/generatenameconfig.py:284
 msgid "MM (minutes)"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:315
+#: rapid/generatenameconfig.py:286
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:800
-#, python-format
-msgid ""
-"Preference key '%(key)s' is invalid.\n"
-"Expected one of %(value)s"
-msgstr ""
-"Asetus '%(key)s' on virheellinen.\n"
-"Tulisi olla yksi näistä %(value)s"
-
-#: rapid/renamesubfolderprefs.py:807
-#, python-format
-msgid "Preference value '%(value)s' is invalid"
-msgstr "Asetuksen arvo '%(value)s' on virheellinen"
-
-#: rapid/renamesubfolderprefs.py:811
-msgid "These preferences are not well formed:"
-msgstr "Nämä asetukset eivät ole oikeassa muodossa:"
-
-#: rapid/renamesubfolderprefs.py:1524
+#: rapid/preferencesdialog.py:374
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Alikansioiiden asetusten ei tulisi alkaa %s"
 
-#: rapid/renamesubfolderprefs.py:1526
+#: rapid/preferencesdialog.py:376
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Alikansioiden asetusten ei tulisi loppua %s"
 
-#: rapid/renamesubfolderprefs.py:1530
+#: rapid/preferencesdialog.py:380
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Alikansioiden asetusten ei tulisi sisältää kahta vierekkäistä %s"
 
-#: rapid/glade3/rapid.glade.h:1
-msgid " "
-msgstr " "
+#: rapid/preferencesdialog.py:439 rapid/preferencesdialog.py:700
+msgid "Remove all Job Codes?"
+msgstr "Poista kaikki työkoodit?"
 
-#: rapid/glade3/rapid.glade.h:2
-msgid "      "
-msgstr "      "
+#: rapid/preferencesdialog.py:440 rapid/preferencesdialog.py:717
+msgid "Should all Job Codes be removed?"
+msgstr "Tulisiko kaikki työkoodit poistaa?"
 
-#: rapid/glade3/rapid.glade.h:3
-msgid " hh:mm"
-msgstr " hh:mm"
+#: rapid/preferencesdialog.py:446
+msgid "Remove all Remembered Paths?"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:4
-msgid ":"
-msgstr ":"
+#: rapid/preferencesdialog.py:447
+msgid "Should all remembered paths be removed?"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:5
-msgid "<b>Backup</b>"
-msgstr "<b>Varmuuskopio</b>"
+#: rapid/preferencesdialog.py:453
+msgid "Remove all Ignored Paths?"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:6
-msgid "<b>Compatibility with Other Operating Systems</b>"
-msgstr "<b>Yhteensopivuus käyttöjärjestelmien kanssa</b>"
+#: rapid/preferencesdialog.py:454
+msgid "Should all ignored paths be removed?"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:7
-msgid "<b>Devices</b>"
-msgstr "<b>Laitteet</b>"
+#: rapid/preferencesdialog.py:465
+msgid "Error in Photo Rename preferences"
+msgstr "Virhe kuvien uudelleennimeämisen määrityksissä"
 
-#: rapid/glade3/rapid.glade.h:8
-msgid "<b>Download Folder</b>"
-msgstr "<b>Latauskansio</b>"
+#: rapid/preferencesdialog.py:645
+msgid "Error in Video Rename preferences"
+msgstr "Virhe videoiden uudelleennimeämisen määrityksissä"
 
-#: rapid/glade3/rapid.glade.h:9
-msgid "<b>Download Subfolders</b>"
-msgstr "<b>Latausalikansio</b>"
+#: rapid/preferencesdialog.py:666
+msgid "Error in Photo Download Subfolders preferences"
+msgstr "Virhe kuvien latauksen alikansion määrityksissä"
 
-#: rapid/glade3/rapid.glade.h:10
-msgid "<b>Example</b>"
-msgstr "<b>Esimerkki</b>"
+#: rapid/preferencesdialog.py:683
+msgid "Error in Video Download Subfolders preferences"
+msgstr "Virhe videoiden latauksen alikansion määrityksissä"
 
-#: rapid/glade3/rapid.glade.h:11
-msgid "<b>Job Codes</b>"
-msgstr "<b>Työkoodit</b>"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:742
+msgid "Enter a Job Code"
+msgstr "Syöta työkoodi"
 
-#: rapid/glade3/rapid.glade.h:12
-msgid "<b>Photo Rename</b>"
-msgstr "<b>Kuvan Uudelleennimeäminen</b>"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:758
+msgid "Enter a new Job Code, or select a previous one"
+msgstr "Syötä työkoodi tai valitse edellisistä"
 
-#: rapid/glade3/rapid.glade.h:13
-msgid "<b>Photo and Video Name Conflicts</b>"
-msgstr "<b>Kuva- ja videonimien ristiriidat</b>"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:761
+msgid "Enter a new Job Code"
+msgstr "Syötä uusi työkoodi"
 
-#: rapid/glade3/rapid.glade.h:14
-msgid "<b>Program Automation</b>"
-msgstr "<b>Ohjelman automatiikka</b>"
+#: rapid/preferencesdialog.py:766
+msgid "Job Code:"
+msgstr "Työkoodi:"
 
-#: rapid/glade3/rapid.glade.h:15
-msgid "<b>Sequence Numbers</b>"
-msgstr "<b>Numeroinnit</b>"
+#: rapid/preferencesdialog.py:822
+msgid "Enter a Path to Ignore"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:16
-msgid "<i>/media/externaldrive/Photos</i>"
-msgstr "<i>/media/ulkoinenlevy/Kuvat</i>"
+#: rapid/preferencesdialog.py:834
+msgid "Specify a path that will never be scanned for photos or videos"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:17
-msgid "<i>Example: /home/user/Pictures</i>"
-msgstr "<i>Esimerkki: /home/user/Kuvat</i>"
+#: rapid/preferencesdialog.py:839
+msgid "Path:"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:18
-msgid "<i>Example:</i>"
-msgstr "<i>Esimerkki</i>"
+#: rapid/preferencesdialog.py:1092
+msgid "Job Code"
+msgstr "Työkoodi"
 
-#: rapid/glade3/rapid.glade.h:19
-msgid "<i>New:</i>"
-msgstr "<i>Uusi:</i>"
+#: rapid/preferencesdialog.py:1363
+msgid "Select a folder in which to backup photos"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:20
-msgid "<i>Original:</i>"
-msgstr "<i>Alkuperäinen:</i>"
+#: rapid/preferencesdialog.py:1376
+msgid "Select a folder in which to backup videos"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:21
-msgid "<span weight=\"bold\" size=\"x-large\">Automation</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Automatisointi</span>"
+#. 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:1473
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
+msgstr ""
+"<i><b>Varoitus:</b> Tiedostossa ei ole riittävästi metatietoja nimen "
+"luomiseksi. Käytä muita uudelleennimeämis valintoja.</i>"
 
-#: rapid/glade3/rapid.glade.h:22
-msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">Varmuuskopio</span>\t"
+#: rapid/preferencesdialog.py:1524
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
+"subfolders. Please use other subfolder naming options.</i>"
+msgstr ""
+"<i><b>Varoitus:</b> Tiedostossa ei ole riittävästi metatietoja alikansioiden "
+"luomiseksi. Käytä muita alikansion nimeämisvalintoja.</i>"
 
-#: rapid/glade3/rapid.glade.h:23
-msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Laitteet</span>"
+#. 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:1527
+#, python-format
+msgid "<i>Example: %s</i>"
+msgstr "<i>Esimerkki: %s</i>"
 
-#: rapid/glade3/rapid.glade.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Virheenkäsittely</span>"
+#. Preferences list is now empty
+#: rapid/preferencesdialog.py:1617
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
+"They will be reset to their default values."
+msgstr ""
+"Annetut alikansioasetukset %(filetype)s tiedostoille olivat väärät ja niitä "
+"ei voi käyttää.\n"
+"Asetukset palautetaan oletusarvoihin."
 
-#: rapid/glade3/rapid.glade.h:25
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Työkoodit</span>"
+#: rapid/preferencesdialog.py:1762
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Kuvien latauskansiot</span>"
+#: rapid/preferencesdialog.py:1764
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+#: rapid/preferencesdialog.py:1765
+msgid "Invalid regular expression"
 msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Kuvan uudelleenimeäminen</span>\t"
 
-#: rapid/glade3/rapid.glade.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1949
+msgid "externaldrive1"
+msgstr "ulkoinenasema1"
+
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1951
+msgid "externaldrive2"
+msgstr "ulkoinenasema2"
+
+#: rapid/prefsrapid.py:127
+msgid "New York"
+msgstr "New York"
+
+#: rapid/prefsrapid.py:128
+msgid "Manila"
+msgstr "Manila"
+
+#: rapid/prefsrapid.py:128
+msgid "Prague"
+msgstr "Praha"
+
+#: rapid/prefsrapid.py:128
+msgid "Helsinki"
+msgstr "Helsinki"
+
+#: rapid/prefsrapid.py:128
+msgid "Wellington"
+msgstr "Wellington"
+
+#: rapid/prefsrapid.py:129
+msgid "Tehran"
+msgstr "Teheran"
+
+#: rapid/prefsrapid.py:129
+msgid "Kampala"
+msgstr "Guatemala"
+
+#: rapid/prefsrapid.py:129
+msgid "Paris"
+msgstr "Pariisi"
+
+#: rapid/prefsrapid.py:129
+msgid "Berlin"
+msgstr "Berliini"
+
+#: rapid/prefsrapid.py:129
+msgid "Sydney"
+msgstr "Sydney"
+
+#: rapid/prefsrapid.py:130
+msgid "Budapest"
+msgstr "Budapest"
+
+#: rapid/prefsrapid.py:130
+msgid "Rome"
+msgstr "Rooma"
+
+#: rapid/prefsrapid.py:130
+msgid "Moscow"
+msgstr "Moskova"
+
+#: rapid/prefsrapid.py:130
+msgid "Delhi"
+msgstr "Delhi"
+
+#: rapid/prefsrapid.py:130
+msgid "Warsaw"
+msgstr "Varsova"
+
+#: rapid/prefsrapid.py:131
+msgid "Jakarta"
+msgstr "Jakarta"
+
+#: rapid/prefsrapid.py:131
+msgid "Madrid"
+msgstr "Madrid"
+
+#: rapid/prefsrapid.py:131
+msgid "Stockholm"
+msgstr "Tukholma"
+
+#. components
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
+msgid "subfolder"
+msgstr "alikansio"
+
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
+msgid "filename"
+msgstr "tiedostonimi"
+
+#: rapid/problemnotification.py:85
+#, python-format
+msgid "Date time value %s appears invalid."
 msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Uudelleennimeämis valinnat</span>"
 
-#: rapid/glade3/rapid.glade.h:29
-msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+#: rapid/problemnotification.py:86
+msgid "Filename does not have an extension."
 msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Videoiden latauskansiot</span>"
 
-#: rapid/glade3/rapid.glade.h:30
-msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+#. a number component is something like the 8346 in IMG_8346.JPG
+#: rapid/problemnotification.py:88
+msgid "Filename does not have a number component."
 msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Videon uudelleenimeäminen</span>\t"
 
-#: rapid/glade3/rapid.glade.h:31
-msgid "Add unique identifier"
-msgstr "Lisää yksilöllinen tunniste"
+#: rapid/problemnotification.py:89
+#, python-format
+msgid "Error generating component %s."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:32
-msgid "Automatically detect Portable Storage Devices"
-msgstr "Tunnista automaattisesti ulkoiset tallennuslaitteet"
+#. a generic problem
+#: rapid/problemnotification.py:91
+#, python-format
+msgid "%(filetype)s metadata cannot be read"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:33
-msgid "Automatically detect backup devices"
-msgstr "Tunnista automaattisesti varmuuskopiolaitteet"
+#: rapid/problemnotification.py:93
+#, python-format
+msgid "%(filetype)s %(area)s could not be generated"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:34
-msgid "Automatically detect devices"
-msgstr "Tunnista laitteet automaattisesti"
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
+#, python-format
+msgid "An error occurred when copying the %(filetype)s"
+msgstr ""
+
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:35
-msgid "Automation"
-msgstr "Automatisointi"
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
+#, python-format
+msgid "%(filetype)s already exists"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:36
-msgid "Backup"
-msgstr "Varmuuskopio"
+#: rapid/problemnotification.py:105
+#, python-format
+msgid ""
+"%(filetype)s could not be backed up because no suitable backup locations "
+"were found."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:37
-msgid "Backup location:"
-msgstr "Varmuuskopioiden sijainti:"
+#: rapid/problemnotification.py:110
+#, 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/glade3/rapid.glade.h:38
-msgid "Backup photos and videos when downloading"
-msgstr "Varmuuskopioi kuvat ja videot ladattaessa"
+#: rapid/problemnotification.py:111
+#, python-format
+msgid "%(filetype)s was already downloaded"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:39
+#: rapid/problemnotification.py:115
+#, python-format
 msgid ""
-"Choose the download folder. Subfolders for the downloaded photos will be "
-"automatically created in this folder using the structure specified below."
+"The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+"identifier '%(identifier)s' added."
+msgstr ""
+
+#: rapid/problemnotification.py:116
+#, python-format
+msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
+msgstr ""
+
+#: rapid/problemnotification.py:117
+#, python-format
+msgid "There is no data with which to name the %(filetype)s."
+msgstr ""
+
+#: rapid/problemnotification.py:119
+#, python-format
+msgid "Error: %(errorno)s %(strerror)s"
 msgstr ""
-"Valitse latauskansio. Alikansiot ladatuille kuville tehdään automaattisesti "
-"tähän kansioon käyttäen alla määriteltyä rakennetta käyttäen."
 
-#: rapid/glade3/rapid.glade.h:40
+#: rapid/problemnotification.py:210
 msgid ""
-"Choose the download folder. Subfolders for the downloaded videos will be "
-"automatically created in this folder using the structure specified below."
+"File verification failed. The downloaded version is different from the "
+"original."
 msgstr ""
-"Valitse latauskansio. Alikansiot ladattuja videoita varten luodaan tähän "
-"hakemistoon automaattisesti, käyttäen alla määritettyä rakennetta."
 
-#: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-10"
-msgstr "Copyright Damon Lynch 2007-10"
+#: rapid/problemnotification.py:213
+msgid "The metadata might be corrupt."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:42
-msgid "Day start:"
-msgstr "Päivän alku:"
+#: rapid/problemnotification.py:216
+msgid ""
+"The filename, extension and Exif information indicate it has already been "
+"downloaded."
+msgstr ""
+
+#: rapid/problemnotification.py:235
+#, python-format
+msgid " It was backed up to %(volume)s"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:43
-msgid "Delete photos and videos from device upon download completion"
-msgstr "Poista kuvat ja videot laitteesta latauksen valmistuttua"
+#: rapid/problemnotification.py:237
+msgid " It was backed up to these devices: "
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:44
-msgid "Devices"
-msgstr "Laitteet"
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
+#, python-format
+msgid "%s, "
+msgstr ""
+
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
+#, python-format
+msgid "%(volumes)s and %(final_volume)s."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:45
+#: rapid/problemnotification.py:252
+#, python-format
 msgid ""
-"Devices are from where to download photos and videos, such as cameras, "
-"memory cards or Portable Storage Devices.\n"
-"\n"
-"You can download photos from multiple devices simultaneously, or you can "
-"specify a location on your hard drive.\n"
-"\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
+"Photos detected with the same filenames, but taken at different times: "
+"%(details)s"
 msgstr ""
-"Laitteita ovat ne, mistä ladataan kuvia ja videoita, kuten kamerat, "
-"muistikortit ja siirrettävät tallennuslaitteet.\n"
-"\n"
-"Voit ladata kuvia useasta laitteesta yhtäaikaisesti, tai määrittää sijainnin "
-"kiintolevylläsi.\n"
-"\n"
-"<i>Jos olet lataamassa suoraan kamerastasi, joka toimii huonosti tai ei "
-"lainkaan, koita asettaa se PTP-tilaan. Jos mahdollista, harkitse "
-"muistikortinlukijan käyttöä."
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Download / Pause"
-msgstr "Lataa / Keskeytä"
+#: rapid/problemnotification.py:269
+#, python-format
+msgid "An error occurred when backing up on %(volume)s: %(inst)s."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:51
-msgid "Download folder:"
-msgstr "Latauskansio:"
+#: rapid/problemnotification.py:271
+#, python-format
+msgid "An error occurred when backing up on %(volume)s."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:52
-msgid "Downloads today:"
-msgstr "Latauksia tänään:"
+#: rapid/problemnotification.py:273
+msgid "Errors occurred when backing up on the following backup devices: "
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:53
-msgid "Error Handling"
-msgstr "Virheenkäsittely"
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
+#, python-format
+msgid "%(volume)s (%(inst)s), "
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:54
-msgid "Error Log"
-msgstr "Virheloki"
+#: rapid/problemnotification.py:279
+#, python-format
+msgid "%(volume)s, "
+msgstr ""
+
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
+#, python-format
+msgid "%(volumes)s and %(volume)s (%(inst)s)."
+msgstr ""
+
+#: rapid/problemnotification.py:288
+#, python-format
+msgid "%(volumes)s and %(volume)s."
+msgstr ""
+
+#: rapid/problemnotification.py:296
+#, python-format
+msgid "Backup already exists on %(volume)s."
+msgstr ""
+
+#: rapid/problemnotification.py:298
+msgid "Backups already exist in these locations: "
+msgstr ""
+
+#: rapid/problemnotification.py:308
+#, python-format
+msgid "Backup overwritten on %(volume)s."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Exit program if download completes without any warnings or errors"
+#: rapid/problemnotification.py:310
+msgid "Backups overwritten on these devices: "
 msgstr ""
-"Poistu ohjelmasta jos lataus valmistuu ilman huomautuksia tai virheitä"
 
-#: rapid/glade3/rapid.glade.h:56
-msgid "If you disable automatic detection, choose the exact backup location."
+#: rapid/problemnotification.py:321
+#, python-format
+msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr ""
-"Jos poistat automaattisen tunnistuksen käytöstä, määritä varmuuskopioiden "
-"tarkka sijainti."
 
-#: rapid/glade3/rapid.glade.h:57
+#: rapid/problemnotification.py:323
 msgid ""
-"If you disable automatic detection, choose the exact location of the images "
-"and videos."
+"Errors occurred when creating directories on the following backup devices: "
 msgstr ""
-"Jos otat automaattisen tunnistuksen pois päältä, valitse kuvien ja videoiden "
-"tarkka sijainti."
 
-#: rapid/glade3/rapid.glade.h:58
+#: rapid/problemnotification.py:335
+#, python-format
 msgid ""
-"If you enable automatic detection of Portable Storage Devices, the entire "
-"device will be scanned for images. On large devices, this could take some "
-"time."
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
 msgstr ""
-"Jos kytket päälle automaattisen kannettavan laitteen tunnistuksen, koko "
-"laite käydään läpi kuvia etsittäessä, tämä voi kestää hetken."
 
-#: rapid/glade3/rapid.glade.h:59
-msgid "Import your photos and videos efficiently and reliably"
-msgstr "Tuo kuvasi ja videosi tehokkaasti ja luotettavasti"
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:60
-msgid "Job Codes"
-msgstr "Työkoodit"
+#: rapid/problemnotification.py:347
+#, python-format
+msgid "%(previousproblem)s Additionally, %(newproblem)s"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:61
-msgid "Location:"
-msgstr "Sijainti:"
+#: rapid/problemnotification.py:355
+#, python-format
+msgid " Furthermore, there were %(problems)s."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:62
-msgid "Overwrite"
-msgstr "Ylikirjoita"
+#: rapid/problemnotification.py:357
+#, python-format
+msgid " Furthermore, there was a %(problem)s."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:63
-msgid "P_review Columns"
+#: rapid/problemnotification.py:366
+#, python-format
+msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:64
-msgid "Photo Folders"
-msgstr "Kuvakansiot"
+#: rapid/problemnotification.py:368
+msgid "The following metadata is missing: "
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:65
-msgid "Photo Rename"
-msgstr "Kuvan Uudelleennimeäminen"
+#: rapid/problemnotification.py:371
+#, python-format
+msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:66
-msgid "Photo backup folder name:"
-msgstr "Kuvien varmuuskopiokansion nimi:"
+#: rapid/problemnotification.py:388
+msgid "Problems in subfolder and filename generation"
+msgstr ""
+
+#: rapid/problemnotification.py:390
+msgid "Problem in subfolder and filename generation"
+msgstr ""
+
+#: rapid/problemnotification.py:393
+#, python-format
+msgid "Problems in %s generation"
+msgstr ""
+
+#: rapid/problemnotification.py:395
+#, python-format
+msgid "Problem in %s generation"
+msgstr ""
+
+#: rapid/problemnotification.py:404
+#, python-format
+msgid "%(filetype)s already exists, but it was backed up"
+msgstr ""
+
+#: rapid/problemnotification.py:406
+#, python-format
+msgid "An error occurred when copying the %(filetype)s, but it was backed up"
+msgstr ""
+
+#: rapid/problemnotification.py:428
+msgid "Multiple problems were encountered"
+msgstr ""
+
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
+msgid "Photos detected with the same filenames, but taken at different times"
+msgstr "Saman niminen kuva havaittu, mutta kuvat on otettu eri aikaan"
+
+#: rapid/problemnotification.py:436
+msgid "there were errors backing up"
+msgstr ""
+
+#: rapid/problemnotification.py:437
+msgid "There were errors backing up"
+msgstr ""
+
+#: rapid/problemnotification.py:439
+msgid "there was an error backing up"
+msgstr ""
+
+#: rapid/problemnotification.py:440
+msgid "There was an error backing up"
+msgstr ""
+
+#. e.g.
+#: rapid/problemnotification.py:443
+#, python-format
+msgid "%(previousproblem)s, and %(backinguperror)s"
+msgstr ""
+
+#: rapid/rpdfile.py:159
+#, python-format
+msgid "%(number)s %(filetypes)s"
+msgstr "%(number)s %(filetypes)s"
+
+#: rapid/rpdfile.py:169
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
+msgstr ""
+
+#: rapid/subfolderfile.py:81
+#, python-format
+msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/glade3/rapid.glade.h:67
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr "alikansio ja tiedstonimi"
+
+#: rapid/subfolderfile.py:406
+msgid "Photo has already been downloaded"
+msgstr "Kuva on jo ladattu"
+
+#: rapid/subfolderfile.py:407
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Lähde: %(source)s"
+
+#: rapid/subfolderfile.py:485
+msgid "Failed to create download subfolder"
+msgstr ""
+
+#: rapid/subfolderfile.py:486
+#, python-format
+msgid "Path: %s"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "_Tee lahjoitus"
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr "_Hae ohjeita netistä..."
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr "_Raportoi ongelma..."
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:16
+msgid "_File"
+msgstr "_Tiedosto"
+
+#: rapid/glade3/rapid.ui.h:17
+msgid "Download / Pause"
+msgstr "Lataa / Keskeytä"
+
+#: rapid/glade3/rapid.ui.h:18
+msgid "_Select"
+msgstr "_Valitse"
+
+#: rapid/glade3/rapid.ui.h:19
+msgid "Select All Without _Job Code"
+msgstr "Valitse kaikki työ_koodittomat"
+
+#: rapid/glade3/rapid.ui.h:20
+msgid "Select All Wit_h Job Code"
+msgstr "Valitse kaikki _työkoodilliset"
+
+#: rapid/glade3/rapid.ui.h:21
+msgid "_View"
+msgstr "_Näytä"
+
+#: rapid/glade3/rapid.ui.h:22
+msgid "_Error Log"
+msgstr "Virheloki"
+
+#: rapid/glade3/rapid.ui.h:23
+msgid "_Clear Completed Downloads"
+msgstr "_Tyhjennä valmistuneet lataukset"
+
+#: rapid/glade3/rapid.ui.h:24
+msgid "Previous File"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:25
+msgid "Next File"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:26
+msgid "_Help"
+msgstr "_Ohje"
+
+#: rapid/glade3/rapid.ui.h:27
+msgid "_Translate this Application..."
+msgstr "_Käännä tämä ohjelma..."
+
+#: rapid/glade3/rapid.ui.h:28
+msgid "_Include in download"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:29
+msgid "_Download"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:1
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Asetukset: Nopea Valokuvien Lataaja"
 
-#: rapid/glade3/rapid.glade.h:68
-msgid "Preview _Folders"
-msgstr "Esikatsele _kansioita"
+#: rapid/glade3/prefs.ui.h:2
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Kuvien latauskansiot</span>"
+
+#: rapid/glade3/prefs.ui.h:3
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr "<i>Esimerkki: /home/user/Kuvat</i>"
 
-#: rapid/glade3/rapid.glade.h:70
-msgid "R_emove All"
-msgstr "P_oista kaikki"
+#: rapid/glade3/prefs.ui.h:4
+msgid "<b>Download Subfolders</b>"
+msgstr "<b>Latausalikansio</b>"
+
+#: rapid/glade3/prefs.ui.h:5
+msgid "Download folder:"
+msgstr "Latauskansio:"
 
-#: rapid/glade3/rapid.glade.h:72
+#: rapid/glade3/prefs.ui.h:6
 msgid ""
-"Rapid Photo Downloader is free software; you can redistribute it and/or "
-"modify it under the terms of the GNU General Public License as published by "
-"the Free Software Foundation; either version 2 of the License, or (at your "
-"option) any later version.\n"
-"\n"
-"Rapid Photo Downloader is distributed in the hope that it will be useful, "
-"but WITHOUT ANY WARRANTY; without even the implied warranty of "
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
-"Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"Rapid Photo Downloader; if not, write to the Free Software Foundation, Inc., "
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-msgstr ""
-"Rapid Photo Downloader is free software; you can redistribute it and/or "
-"modify it under the terms of the GNU General Public License as published by "
-"the Free Software Foundation; either version 2 of the License, or (at your "
-"option) any later version.\n"
-"\n"
-"Rapid Photo Downloader is distributed in the hope that it will be useful, "
-"but WITHOUT ANY WARRANTY; without even the implied warranty of "
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General "
-"Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"Rapid Photo Downloader; if not, write to the Free Software Foundation, Inc., "
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"Choose the download folder. Subfolders for the downloaded photos will be "
+"automatically created in this folder using the structure specified below."
+msgstr ""
+"Valitse latauskansio. Alikansiot ladatuille kuville tehdään automaattisesti "
+"tähän kansioon käyttäen alla määriteltyä rakennetta käyttäen."
 
-#: rapid/glade3/rapid.glade.h:77
-msgid "Rename Options"
-msgstr "Uudelleennimeämis valinnat"
+#: rapid/glade3/prefs.ui.h:7
+msgid "<b>Download Folder</b>"
+msgstr "<b>Latauskansio</b>"
 
-#: rapid/glade3/rapid.glade.h:78
-msgid "Se_lect None"
-msgstr "_Poista valinta"
+#: rapid/glade3/prefs.ui.h:8
+msgid "Photo Folders"
+msgstr "Kuvakansiot"
 
-#: rapid/glade3/rapid.glade.h:79
-msgid "Select All Pho_tos"
-msgstr "Valitse k_aikki kuvat"
+#: rapid/glade3/prefs.ui.h:9
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Kuvan uudelleenimeäminen</span>\t"
 
-#: rapid/glade3/rapid.glade.h:80
-msgid "Select All Vi_deos"
-msgstr "Valitse kaikki vi_deot"
+#: rapid/glade3/prefs.ui.h:10
+msgid "<b>Photo Rename</b>"
+msgstr "<b>Kuvan Uudelleennimeäminen</b>"
 
-#: rapid/glade3/rapid.glade.h:81
-msgid "Select All Wit_h Job Code"
-msgstr "Valitse kaikki _työkoodilliset"
+#: rapid/glade3/prefs.ui.h:11
+msgid " "
+msgstr " "
 
-#: rapid/glade3/rapid.glade.h:82
-msgid "Select All Without _Job Code"
-msgstr "Valitse kaikki työ_koodittomat"
+#: rapid/glade3/prefs.ui.h:12
+msgid "<i>New:</i>"
+msgstr "<i>Uusi:</i>"
 
-#: rapid/glade3/rapid.glade.h:83
-msgid "Select _All"
-msgstr "Valitse _kaikki"
+#: rapid/glade3/prefs.ui.h:13
+msgid "<i>Original:</i>"
+msgstr "<i>Alkuperäinen:</i>"
 
-#: rapid/glade3/rapid.glade.h:84
-msgid "Skip"
-msgstr "Ohita"
+#: rapid/glade3/prefs.ui.h:14
+msgid "<b>Example</b>"
+msgstr "<b>Esimerkki</b>"
 
-#: rapid/glade3/rapid.glade.h:85
-msgid "Skip download"
-msgstr "Ohita lataus"
+#: rapid/glade3/prefs.ui.h:15
+msgid "Photo Rename"
+msgstr "Kuvan Uudelleennimeäminen"
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/prefs.ui.h:16
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Videoiden latauskansiot</span>"
+
+#: rapid/glade3/prefs.ui.h:17
 msgid ""
 "Sorry, video downloading functionality disabled. To download videos, please "
-"install the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for "
-"python."
+"install either the <i>hachoir metadata</i> and <i>kaa metadata</i> packages "
+"for python, or <i>exiftool</i>."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/prefs.ui.h:18
 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>"
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
 msgstr ""
-"Määrität kansio mihin varmuuskopiot tallennetaan laitteella.  \n"
-"\n"
-"<i>Huomaa: tällä tullaan myös selvittämään käytetäänkö laitetta "
-"varmuuskopiointiin. Luo jokaiseen laitteeseen mitä haluat käyttää "
-"varmuuskopiointiin, kansio käyttäen yhtä näistä nimistä.</i>"
+"Valitse latauskansio. Alikansiot ladattuja videoita varten luodaan tähän "
+"hakemistoon automaattisesti, käyttäen alla määritettyä rakennetta."
+
+#: rapid/glade3/prefs.ui.h:19
+msgid "Video Folders"
+msgstr "Videokansiot"
+
+#: rapid/glade3/prefs.ui.h:20
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Videon uudelleenimeäminen</span>\t"
+
+#: rapid/glade3/prefs.ui.h:21
+msgid "Video Rename"
+msgstr "Videon uudelleenimeäminen"
+
+#: rapid/glade3/prefs.ui.h:22
+msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Uudelleennimeämis valinnat</span>"
+
+#: rapid/glade3/prefs.ui.h:23
+msgid "<b>Sequence Numbers</b>"
+msgstr "<b>Numeroinnit</b>"
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/prefs.ui.h:24
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
@@ -1886,7 +1673,35 @@ msgstr ""
 "Valitse aika 24 tunnin muodossa jossa <i>Latauksia tänään</i> numerointi "
 "tulisi palauttaa."
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/prefs.ui.h:25
+msgid "Day start:"
+msgstr "Päivän alku:"
+
+#: rapid/glade3/prefs.ui.h:26
+msgid "Downloads today:"
+msgstr "Latauksia tänään:"
+
+#: rapid/glade3/prefs.ui.h:27
+msgid "Stored number:"
+msgstr "Tallennettu numero:"
+
+#: rapid/glade3/prefs.ui.h:28
+msgid ":"
+msgstr ":"
+
+#: rapid/glade3/prefs.ui.h:29
+msgid " hh:mm"
+msgstr " hh:mm"
+
+#: rapid/glade3/prefs.ui.h:30
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "Yhtenäistä RAW + JPEG järjestysnumerot"
+
+#: rapid/glade3/prefs.ui.h:31
+msgid "<b>Compatibility with Other Operating Systems</b>"
+msgstr "<b>Yhteensopivuus käyttöjärjestelmien kanssa</b>"
+
+#: rapid/glade3/prefs.ui.h:32
 msgid ""
 "Specify whether photo, video and folder names should have any characters "
 "removed that are not allowed by other operating systems."
@@ -1894,59 +1709,139 @@ msgstr ""
 "Määrittele, pitäisikö kuvien, videoiden ja kansioiden nimistä poistaa "
 "merkit, jotka eivät ole sallittuja muissa käyttöjärjestelmissä."
 
-#: rapid/glade3/rapid.glade.h:92
-msgid "Start downloading at program startup"
-msgstr "Aloita lataus kun ohjelma käynnistetään"
+#: rapid/glade3/prefs.ui.h:33
+msgid "Strip incompatible characters"
+msgstr "Poista yhteensopimattomat merkit"
 
-#: rapid/glade3/rapid.glade.h:93
-msgid "Start downloading upon device insertion"
-msgstr "Aloita lataaminen kun laite kiinnitetään"
+#: rapid/glade3/prefs.ui.h:34
+msgid "Rename Options"
+msgstr "Uudelleennimeämis valinnat"
 
-#: rapid/glade3/rapid.glade.h:94
-msgid "Stored number:"
-msgstr "Tallennettu numero:"
+#: rapid/glade3/prefs.ui.h:35
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Työkoodit</span>"
 
-#: rapid/glade3/rapid.glade.h:95
-msgid "Strip incompatible characters"
-msgstr "Poista yhteensopimattomat merkit"
+#: rapid/glade3/prefs.ui.h:36
+msgid "<b>Job Codes</b>"
+msgstr "<b>Työkoodit</b>"
 
-#: rapid/glade3/rapid.glade.h:96
-msgid "Synchronize RAW + JPEG sequence numbers"
-msgstr "Yhtenäistä RAW + JPEG järjestysnumerot"
+#: rapid/glade3/prefs.ui.h:37
+msgid "_Add..."
+msgstr "_Lisää..."
 
-#: rapid/glade3/rapid.glade.h:97
-msgid "Unmount (\"eject\") device upon download completion"
-msgstr "Irrota (\"poista\") laite latauksen valmistuttua"
+#: rapid/glade3/prefs.ui.h:39
+msgid "R_emove All"
+msgstr "P_oista kaikki"
 
-#: rapid/glade3/rapid.glade.h:98
-msgid "Video Folders"
-msgstr "Videokansiot"
+#: rapid/glade3/prefs.ui.h:40
+msgid "Job Codes"
+msgstr "Työkoodit"
 
-#: rapid/glade3/rapid.glade.h:99
-msgid "Video Rename"
-msgstr "Videon uudelleenimeäminen"
+#: rapid/glade3/prefs.ui.h:41
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Laitteet</span>"
 
-#: rapid/glade3/rapid.glade.h:100
-msgid "Video backup folder name:"
-msgstr "Videoiden varmuuskopiokansion nimi:"
+#: rapid/glade3/prefs.ui.h:42
+msgid "Devices"
+msgstr "Laitteet"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/prefs.ui.h:43
 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."
+"Devices are from where to download photos and videos, such as cameras, "
+"memory cards or Portable Storage Devices.\n"
+"\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\n"
+"\n"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
 msgstr ""
-"Kun kuva tai video samalla nimellä on jo ladattu, valitse ohitetaanko "
-"lataaminen vai lisätäänkö tiedostonimeen yksilöllinen tunniste."
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/prefs.ui.h:48
+msgid "Automatically detect Portable Storage Devices"
+msgstr "Tunnista automaattisesti ulkoiset tallennuslaitteet"
+
+#: rapid/glade3/prefs.ui.h:49
+msgid "Automatically detect devices"
+msgstr "Tunnista laitteet automaattisesti"
+
+#: rapid/glade3/prefs.ui.h:50
 msgid ""
-"When backing up, choose whether to overwrite a file on the backup device "
-"that has the same name, or skip backing it up."
+"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 ""
-"Kun varmuuskopiodaan, valitse kirjoitetaanko saman nimisten tiedostojen "
-"päälle vai ohitetaanko tiedoston varmuuskopiointi."
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/prefs.ui.h:53
+msgid "Location:"
+msgstr "Sijainti:"
+
+#: rapid/glade3/prefs.ui.h:54
+msgid ""
+"If you disable automatic detection, choose the exact location of the photos "
+"and videos."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:55
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:56
+msgid "Remembered Paths"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:57
+msgid ""
+"Remembered paths are those associated with devices that you have chosen to "
+"always scan or ignore when automatic detection of Portable Storage Devices "
+"is enabled."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:59
+msgid ""
+"Specify the ending portion of any paths you want ignored when scanning "
+"devices for photos or videos. Any path ending with the values below will not "
+"be scanned."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:61
+msgid "Re_move All"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:62
+msgid "Use _python-style regular expressions"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:63
+msgid "Device Options"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:64
+msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Varmuuskopio</span>\t"
+
+#: rapid/glade3/prefs.ui.h:65
+msgid "<b>Backup</b>"
+msgstr "<b>Varmuuskopio</b>"
+
+#: rapid/glade3/prefs.ui.h:66
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:67
+msgid "Automatically detect backup devices"
+msgstr "Tunnista automaattisesti varmuuskopiolaitteet"
+
+#: rapid/glade3/prefs.ui.h:68
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -1954,73 +1849,147 @@ msgstr ""
 "Voit varmuuskopioida kuvat ja videot useaan sijaintiin ladattaessa, "
 "esimerkiksi ulkoisiin kiintolevyihin."
 
-#: rapid/glade3/rapid.glade.h:104
-msgid "_Add..."
-msgstr "_Lisää..."
+#: rapid/glade3/prefs.ui.h:69
+msgid "Back up photos and videos when downloading"
+msgstr "Varmuuskopioi kuvat ja videot ladattaessa"
 
-#: rapid/glade3/rapid.glade.h:105
-msgid "_Clear Completed Downloads"
-msgstr "_Tyhjennä valmistuneet lataukset"
+#: 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 ""
+"Määrität kansio mihin varmuuskopiot tallennetaan laitteella.  \n"
+"\n"
+"<i>Huomaa: tällä tullaan myös selvittämään käytetäänkö laitetta "
+"varmuuskopiointiin. Luo jokaiseen laitteeseen mitä haluat käyttää "
+"varmuuskopiointiin, kansio käyttäen yhtä näistä nimistä.</i>"
 
-#: rapid/glade3/rapid.glade.h:106
-msgid "_Device"
-msgstr "_Laite"
+#: rapid/glade3/prefs.ui.h:73
+msgid "Photo backup location:"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:107
-msgid "_Error Log"
-msgstr "Virheloki"
+#: rapid/glade3/prefs.ui.h:74
+msgid "Photo backup folder name:"
+msgstr "Kuvien varmuuskopiokansion nimi:"
 
-#: rapid/glade3/rapid.glade.h:108
-msgid "_File"
-msgstr "_Tiedosto"
+#: rapid/glade3/prefs.ui.h:75
+msgid "<i>Example:</i>"
+msgstr "<i>Esimerkki</i>"
 
-#: rapid/glade3/rapid.glade.h:109
-msgid "_Filename"
-msgstr "_Tiedostonimi"
+#: rapid/glade3/prefs.ui.h:76
+msgid "<i>/media/externaldrive/Photos</i>"
+msgstr "<i>/media/ulkoinenlevy/Kuvat</i>"
 
-#: rapid/glade3/rapid.glade.h:110
-msgid "_Get Help Online..."
-msgstr "_Hae ohjeita netistä..."
+#: rapid/glade3/prefs.ui.h:77
+msgid "Video backup folder name:"
+msgstr "Videoiden varmuuskopiokansion nimi:"
 
-#: rapid/glade3/rapid.glade.h:111
-msgid "_Help"
-msgstr "_Ohje"
+#: rapid/glade3/prefs.ui.h:78
+msgid "Video backup location:"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:112
-msgid "_Make a Donation..."
-msgstr "_Tee lahjoitus"
+#: rapid/glade3/prefs.ui.h:79
+msgid "Back up"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:113
-msgid "_Path"
-msgstr "_Polku"
+#: rapid/glade3/prefs.ui.h:80
+msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:114
-msgid "_Preview"
-msgstr "_Esikatselu"
+#: rapid/glade3/prefs.ui.h:81
+msgid "<b>Program Automation</b>"
+msgstr "<b>Ohjelman automatiikka</b>"
 
-#: rapid/glade3/rapid.glade.h:115
-msgid "_Report a Problem..."
-msgstr "_Raportoi ongelma..."
+#: rapid/glade3/prefs.ui.h:82
+msgid "Unmount (\"eject\") device upon download completion"
+msgstr "Irrota (\"poista\") laite latauksen valmistuttua"
 
-#: rapid/glade3/rapid.glade.h:116
-msgid "_Select"
-msgstr "_Valitse"
+#: rapid/glade3/prefs.ui.h:83
+msgid "Start downloading at program startup"
+msgstr "Aloita lataus kun ohjelma käynnistetään"
 
-#: rapid/glade3/rapid.glade.h:117
-msgid "_Size"
-msgstr "_Koko"
+#: rapid/glade3/prefs.ui.h:84
+msgid "Start downloading upon device insertion"
+msgstr "Aloita lataaminen kun laite kiinnitetään"
 
-#: rapid/glade3/rapid.glade.h:118
-msgid "_Translate this Application..."
-msgstr "_Käännä tämä ohjelma..."
+#: rapid/glade3/prefs.ui.h:85
+msgid "Exit program when download completes"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:86
+msgid "Exit program even if download had warnings or errors"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:119
-msgid "_Type"
-msgstr "_Tyyppi"
+#: rapid/glade3/prefs.ui.h:87
+msgid "Automatically rotate JPEG images"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:120
-msgid "_View"
-msgstr "_Näytä"
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:90
+msgid "Performance"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:91
+msgid "Generate thumbnails (slower)"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:92
+msgid "Miscellaneous"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:93
+msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Virheenkäsittely</span>"
+
+#: rapid/glade3/prefs.ui.h:94
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr "<b>Kuva- ja videonimien ristiriidat</b>"
+
+#: rapid/glade3/prefs.ui.h:95
+msgid "Add unique identifier"
+msgstr "Lisää yksilöllinen tunniste"
+
+#: rapid/glade3/prefs.ui.h:96
+msgid "Skip download"
+msgstr "Ohita lataus"
+
+#: rapid/glade3/prefs.ui.h:97
+msgid ""
+"When a photo or video of the same name has already been downloaded, choose "
+"whether to skip downloading the file, or to add a unique indentifier."
+msgstr ""
+"Kun kuva tai video samalla nimellä on jo ladattu, valitse ohitetaanko "
+"lataaminen vai lisätäänkö tiedostonimeen yksilöllinen tunniste."
+
+#: rapid/glade3/prefs.ui.h:98
+msgid ""
+"When backing up, choose whether to overwrite a file on the backup device "
+"that has the same name, or skip backing it up."
+msgstr ""
+"Kun varmuuskopiodaan, valitse kirjoitetaanko saman nimisten tiedostojen "
+"päälle vai ohitetaanko tiedoston varmuuskopiointi."
+
+#: rapid/glade3/prefs.ui.h:99
+msgid "Overwrite"
+msgstr "Ylikirjoita"
+
+#: rapid/glade3/prefs.ui.h:100
+msgid "Skip"
+msgstr "Ohita"
+
+#: rapid/glade3/prefs.ui.h:101
+msgid "Error Handling"
+msgstr "Virheenkäsittely"
+
+#: rapid/glade3/about.ui.h:1
+msgid "Import your photos and videos efficiently and reliably"
+msgstr "Tuo kuvasi ja videosi tehokkaasti ja luotettavasti"
 
 #~ msgid "Error in Image Rename preferences"
 #~ msgstr "Virhe kuvan nimeämisasetuksissa"
@@ -2073,6 +2042,9 @@ msgstr "_Näytä"
 #~ msgid "The image was not copied."
 #~ msgstr "Kuvaa ei kopioitu."
 
+#~ msgid "New day has started - resetting 'Downloads Today' sequence number"
+#~ msgstr "Uusi päivä on alkanut - Palautetaan 'Latauksia Tänään' luku"
+
 #, python-format
 #~ msgid "Unique identifier '%s' added"
 #~ msgstr "Yksilöinti '%s' lisätty"
@@ -2081,10 +2053,16 @@ msgstr "_Näytä"
 #~ msgid "%s images skipped"
 #~ msgstr "%s kuvaa ohitettu"
 
+#~ msgid "errors"
+#~ msgstr "virheet"
+
 #, python-format
 #~ msgid "%s images downloaded"
 #~ msgstr "%s kuvaa ladattu"
 
+#~ msgid "The device can now be safely removed"
+#~ msgstr "Laite voidaan turvallisesti poistaa"
+
 #~ msgid "Backup device missing"
 #~ msgstr "Varmuuskopiolaite puuttuu"
 
@@ -2097,6 +2075,14 @@ msgstr "_Näytä"
 #~ msgid "Image has no thumbnail"
 #~ msgstr "Kuvalla ei ole näytekuvaa"
 
+#, python-format
+#~ msgid "Download complete from %s"
+#~ msgstr "Lataus lähteestä %s valmis"
+
+#, python-format
+#~ msgid "Download has started from %s"
+#~ msgstr "Lataus lähteestä %s on alkanut"
+
 #~ msgid "Image skipped"
 #~ msgstr "Kuva ohitettu"
 
@@ -2106,18 +2092,65 @@ msgstr "_Näytä"
 #~ msgid "Image already exists"
 #~ msgstr "Kuva on jo olemassa"
 
+#~ msgid ""
+#~ "This version of the program is newer than the previously run version. "
+#~ "Checking preferences."
+#~ msgstr ""
+#~ "Tämä ohjelma on uudempi kuin aikaisemmin käytetty. Tarkista asetukset."
+
+#~ msgid "Warning:"
+#~ msgstr "Varoitus:"
+
+#~ msgid "Sorry, some preferences are invalid and will be reset."
+#~ msgstr ""
+#~ "Anteeksi, jotkin asetukset ovat virheellisiä ja ne palautetaan "
+#~ "oletusarvoihin."
+
+#~ msgid ""
+#~ "Program preferences appear to be valid, but please check them to ensure "
+#~ "correct operation."
+#~ msgstr ""
+#~ "Ohjelma on kelpaava, mutta ole hyvä ja tarkista että ohjelma toimii oikein."
+
+#~ msgid ""
+#~ "A newer version of this program was previously run on this computer.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Ohjelman uudempaa versiota on käytetty tässä tietokoneessa.\n"
+#~ "\n"
+
+#~ msgid "Preferences were modified."
+#~ msgstr "Asetuksia on muokattu."
+
 #~ msgid "Thumbnail cannot be displayed"
 #~ msgstr "Näytekuvaa ei voida näyttää"
 
 #~ msgid "It may be corrupted"
 #~ msgstr "Se voi olla vahingoittunut"
 
+#~ msgid "No preferences needed to be changed."
+#~ msgstr "Asetuksia ei tarvinnut muuttaa."
+
+#~ msgid "Problem using pynotify."
+#~ msgstr "Ongelmia pynotifyn käytössä."
+
+#~ msgid "Using manually specified path"
+#~ msgstr "Käytetään käsin valittua polkua"
+
 #~ msgid "images skipped"
 #~ msgstr "kuvia ohitettu"
 
 #~ msgid "images downloaded"
 #~ msgstr "kuvia ladattu"
 
+#~ msgid ""
+#~ "\n"
+#~ "Please check preferences, restart the program, and try again."
+#~ msgstr ""
+#~ "\n"
+#~ "Ole hyvä ja tarkista asetukset, käynnistä ohjelma uudelleen ja koita "
+#~ "uudestaan."
+
 #~ msgid "The subfolder preferences had some unnecessary values removed."
 #~ msgstr "Alikansioasetuksista poistettiin tarpeettomia arvoja."
 
@@ -2158,6 +2191,26 @@ msgstr "_Näytä"
 #~ "Kuva: %(image)s\n"
 #~ "Ongelma: %(problem)s"
 
+#~ msgid ""
+#~ "This version of the program uses different preferences than the old version. "
+#~ "Your preferences have been updated.\n"
+#~ "\n"
+#~ "Please check them to ensure correct operation."
+#~ msgstr ""
+#~ "Tämä ohjelmaversio käyttää eri asetuksia kuin vanha versio. Asetuksesi on "
+#~ "päivitettu.\n"
+#~ "\n"
+#~ "Ole hyvä ja tarkista ne varmistaaksesi ohjelman toiminta."
+
+#~ msgid ""
+#~ "This version of the program uses different preferences than the old version. "
+#~ "Some of your previous preferences were invalid, and could not be updated. "
+#~ "They will be reset."
+#~ msgstr ""
+#~ "Tämä ohjelmaversio käyttää eri asetuksia kuin vanha versio. Jotkin entisistä "
+#~ "asetuksistasi olivat virheellisiä ja niitä ei voitu päivittää. Ne "
+#~ "palautetaan oletuksiin."
+
 #, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
@@ -2168,11 +2221,21 @@ msgstr "_Näytä"
 #~ "Kohde: %(destination)s\n"
 #~ "Virhe: %(errno)s %(strerror)s"
 
+#~ msgid "Some preferences will be reset."
+#~ msgstr "Jotkin asetukset palautetaan."
+
 #, python-format
 #~ msgid "%(number)s of %(total)s images copied"
 #~ msgstr "%(number)s kuvaa %(total)s kuvasta kopioitu"
 
 #, python-format
+#~ msgid "Detected %(device)s with path %(path)s"
+#~ msgstr "Löytyi %(device)s laitetta polusta %(path)s"
+
+#~ msgid "Failed to receive pynotify server capabilities."
+#~ msgstr "Ei saanut pynotify-palvelimen ominaisuuksia."
+
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s\n"
@@ -2188,12 +2251,31 @@ msgstr "_Näytä"
 #~ msgid "_Download "
 #~ msgstr "_Lataa "
 
+#~ msgid "_Pause"
+#~ msgstr "_Keskeytä"
+
 #~ msgid "Preferences were changed."
 #~ msgstr "Asetuksia muutettiin."
 
 #~ msgid "list image file extensions the program recognizes and exit"
 #~ msgstr "Listaa kuvatiedostopäätteet jotka ohjelma tunnistaa ja poistu"
 
+#~ msgid "Goodbye"
+#~ msgstr "Näkemiin"
+
+#~ msgid "Automatically start download is false"
+#~ msgstr "Automaattinen latauksen aloitus on pois päältä"
+
+#~ msgid "Automatically start download is true"
+#~ msgstr "Automaattinen latauksen aloitus on päällä"
+
+#, python-format
+#~ msgid "%s is already running"
+#~ msgstr "%s on jo käynnissä"
+
+#~ msgid "Using"
+#~ msgstr "Käyttäen"
+
 #~ msgid "extension was specified but image name has no extension"
 #~ msgstr ""
 #~ "tiedostopääte oli määritelty mutta kuvan nimessä ei ole tiedostopäätettä"
@@ -2211,6 +2293,13 @@ msgstr "_Näytä"
 #~ "%(directory)s\n"
 #~ "Virhe: %(errno)s %(strerror)s"
 
+#, python-format
+#~ msgid "Preference value '%(value)s' is invalid"
+#~ msgstr "Asetuksen arvo '%(value)s' on virheellinen"
+
+#~ msgid "These preferences are not well formed:"
+#~ msgstr "Nämä asetukset eivät ole oikeassa muodossa:"
+
 #~ msgid "Subsecond metadata not present in image"
 #~ msgstr "sekunnin osia ei löydy metatiedoista tässä kuvassa"
 
@@ -2222,6 +2311,9 @@ msgstr "_Näytä"
 #~ msgid "error generating name with component %s"
 #~ msgstr "virhe luotaessa nimeä osalla %s"
 
+#~ msgid "      "
+#~ msgstr "      "
+
 #~ msgid "<b>Image Devices</b>"
 #~ msgstr "<b>Kuva laitteet</b>"
 
@@ -2234,6 +2326,9 @@ msgstr "_Näytä"
 #~ msgid "<i>Example: /home/user/photos</i>"
 #~ msgstr "<i>Esimerkki: /home/käyttäjä/kuvat</i>"
 
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Automation</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Automatisointi</span>"
+
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Latauskansio</span>"
 
@@ -2247,9 +2342,18 @@ msgstr "_Näytä"
 #~ msgid "Automatically detect image devices"
 #~ msgstr "Tunnista automaattisesti kuvalaitteet"
 
+#~ msgid "Automation"
+#~ msgstr "Automatisointi"
+
+#~ msgid "Backup"
+#~ msgstr "Varmuuskopio"
+
 #~ msgid "Backup folder name:"
 #~ msgstr "Varmuuskopiokansion nimi:"
 
+#~ msgid "Backup location:"
+#~ msgstr "Varmuuskopioiden sijainti:"
+
 #~ msgid "Backup photos when downloading"
 #~ msgstr "Tee varmuuskopio ladattaessa kuvia"
 
@@ -2262,15 +2366,31 @@ msgstr "_Näytä"
 #~ msgid "Download Folder"
 #~ msgstr "Latauskansio"
 
+#~ msgid "Error Log"
+#~ msgstr "Virheloki"
+
 #~ msgid "Exit program after completion of successful download"
 #~ msgstr "Poistu ohjelmasta onnistuneen latauksen jälkeen"
 
+#~ msgid "If you disable automatic detection, choose the exact backup location."
+#~ msgstr ""
+#~ "Jos poistat automaattisen tunnistuksen käytöstä, määritä varmuuskopioiden "
+#~ "tarkka sijainti."
+
 #~ msgid ""
 #~ "If you disable automatic detection, choose the exact location of the images."
 #~ msgstr ""
 #~ "Jos poistat automaattisen tunnistuksen käytöstä, määritä tarkka kuvien "
 #~ "sijainti."
 
+#~ msgid ""
+#~ "If you enable automatic detection of Portable Storage Devices, the entire "
+#~ "device will be scanned for images. On large devices, this could take some "
+#~ "time."
+#~ msgstr ""
+#~ "Jos kytket päälle automaattisen kannettavan laitteen tunnistuksen, koko "
+#~ "laite käydään läpi kuvia etsittäessä, tämä voi kestää hetken."
+
 #~ msgid "Ignore"
 #~ msgstr "Ohita"
 
@@ -2350,12 +2470,58 @@ msgstr "_Näytä"
 #~ msgid "Error in date time component. Value %s appears invalid"
 #~ msgstr "Virhe aikamäärityksessä. Arvo %s näyttää virheelliseltä"
 
+#, python-format
+#~ msgid ""
+#~ "Preference key '%(key)s' is invalid.\n"
+#~ "Expected one of %(value)s"
+#~ msgstr ""
+#~ "Asetus '%(key)s' on virheellinen.\n"
+#~ "Tulisi olla yksi näistä %(value)s"
+
 #~ msgid "<b>Image Name Conflicts</b>"
 #~ msgstr "<b>Kuvannimien konfliktit</b>"
 
+#~ msgid "Resetting value to zero.\n"
+#~ msgstr "Palautetaan arvo nollaan.\n"
+
+#~ msgid "Resetting to default values."
+#~ msgstr "Palautetaan oletusarvot."
+
 #~ msgid "Copyright Damon Lynch 2007-09"
 #~ msgstr "Tekijänoikeus Damon Lynch 2007-09"
 
+#~ msgid "Invalid Downloads Today value.\n"
+#~ msgstr "Virheelliset lataukset tänään\n"
+
+#~ msgid ""
+#~ "Rapid Photo Downloader is free software; you can redistribute it and/or "
+#~ "modify it under the terms of the GNU General Public License as published by "
+#~ "the Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "Rapid Photo Downloader is distributed in the hope that it will be useful, "
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along with "
+#~ "Rapid Photo Downloader; if not, write to the Free Software Foundation, Inc., "
+#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+#~ msgstr ""
+#~ "Rapid Photo Downloader is free software; you can redistribute it and/or "
+#~ "modify it under the terms of the GNU General Public License as published by "
+#~ "the Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "Rapid Photo Downloader is distributed in the hope that it will be useful, "
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along with "
+#~ "Rapid Photo Downloader; if not, write to the Free Software Foundation, Inc., "
+#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+
 #~ msgid "Error in Download Subfolder preferences"
 #~ msgstr "Virhe latauksen alikansioasetuksissa"
 
@@ -2383,98 +2549,60 @@ msgstr "_Näytä"
 #~ msgid "Select a folder in which to backup images"
 #~ msgstr "Valitse kansio johon varmuuskopio tehdään"
 
-#~ msgid ""
-#~ "Images detected with the same filenames, but taken at different times:"
-#~ msgstr ""
-#~ "Löydettiin kuvia samalla tiedostonimellä, mutta ne on otettu eri ajakohtina:"
+#~ msgid "Job Code entered"
+#~ msgstr "Työkoodi syötetty"
 
-#, python-format
-#~ msgid ""
-#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Ensimmäinen kuva: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Toinen kuva: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+#~ msgid "Starting downloads"
+#~ msgstr "Käynnistetään latauksia"
 
-#~ msgid "Could not delete image from image device"
-#~ msgstr "Poistaminen kuvalaitteelta epäonnistui"
+#~ msgid "Starting downloads that have been waiting for a Job Code"
+#~ msgstr "Työkoodia odottaneet lataukset käynnistetään"
 
-#, python-format
-#~ msgid ""
-#~ "Image: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Kuva: %(source)s\n"
-#~ "Virhe: %(errno)s %(strerror)s"
+#~ msgid "Prompting for Job Code"
+#~ msgstr "Kysyy työkoodia"
 
-#, python-format
-#~ msgid "Image: %(source)s"
-#~ msgstr "Kuva: %(source)s"
+#~ msgid "Resetting to midnight.\n"
+#~ msgstr "Palautetaan keskiyöhön.\n"
 
-#, python-format
-#~ msgid "Deleted %i images from image device"
-#~ msgstr "Poistettiin %i kuvaa kuvalaitteelta"
+#~ msgid "There is an error in the program preferences."
+#~ msgstr "Ohjelman asetuksissa on virhe."
 
 #~ msgid "Should this device or partition be used to download images from?"
 #~ msgstr "Tulisiko tätä laitetta tai osiota käyttää kuvien lataamiseen?"
 
+#~ msgid "Job Code not entered"
+#~ msgstr "Työkoodia ei annettu"
+
+#~ msgid "This device or partition will always be used to download from"
+#~ msgstr "Tätä laitetta tai osiota tullaan aina käyttämään kuvien lataamiseen"
+
+#, python-format
+#~ msgid "%s rejected as a download device"
+#~ msgstr "%s laitetta ei hyväksytty latauslaitteeksi"
+
+#~ msgid "This device or partition will never be used to download from"
+#~ msgstr "Tästä laitteesta tai osiosta ei ladata koskaan"
+
 #~ msgid "Enter a new job code, or select a previous one."
 #~ msgstr "Anna uusi työkoodi tai valitse aikaisempi."
 
 #~ msgid "Enter a new job code."
 #~ msgstr "Anna uusi työkoodi."
 
-#~ msgid "Delete images from image device upon download completion"
-#~ msgstr "Poista kuvat kuvalaitteelta kun lataus on valmis"
-
 #, python-format
-#~ msgid "Image device: %s\n"
-#~ msgstr "Kuvalaite: %s\n"
+#~ msgid "Device %(device)s (%(path)s) ignored"
+#~ msgstr "Laite %(device)s (%(path)s) ohitettu"
 
 #, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Partially generated filename: %(newname)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "Problem: %(problem)s"
-#~ msgstr ""
-#~ "Lähde: %(source)s\n"
-#~ "Osittain luotu tiedostonimi: %(newname)s\n"
-#~ "Kohde: %(destination)s\n"
-#~ "Ongelma: %(problem)s"
+#~ msgid "%s selected for downloading from"
+#~ msgstr "%s valittu ladattavaksi"
 
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ msgstr ""
-#~ "Lähde: %(source)s\n"
-#~ "Kohde: %(destination)s\n"
+#~ msgid "Already prompting for Job Code, do not prompt again"
+#~ msgstr "Työkoodia pyydetään jo, älä pyydä uudestaan"
 
 #, python-format
-#~ msgid ""
-#~ "Sorry, this image location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Anteeksi, tätä kuvasijaintia ei ole:\n"
-#~ "%(path)s"
-
-#~ msgid ""
-#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
-#~ "folder's permissions, or modify your preferences"
-#~ msgstr ""
-#~ "Latauskansio on olemassa, mutta siihen ei voida luoda tiedostoja. Tarkista "
-#~ "kansion oikeudet tai muuta asetuksia."
-
-#~ msgid ""
-#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
-#~ "modify your preferences"
-#~ msgstr "Latauskansiota ei ole olemassa. Luo kansio tai muuta asetuksia."
-
-#~ msgid "Problem with Image Location Folder"
-#~ msgstr "Ongelma Kuvakansiossa"
+#~ msgid "Prompting whether to use %s"
+#~ msgstr "Kysyy tulisiko käyttää laitetta %s"
 
 #~ msgid ""
 #~ "Specify the folder in which backups are stored on the device.  \n"
@@ -2495,146 +2623,8 @@ msgstr "_Näytä"
 #~ "Valitse tuleeko kuva ja kansionimistä poistaa merkit joita ei tueta toisissa "
 #~ "käyttöjärjestelmissä."
 
-#, python-format
-#~ msgid "0 of %(number)s %(filetypes)s"
-#~ msgstr "%(number)s %(filetypes)s"
-
-#, python-format
-#~ msgid "%(filetype)s filename could not be generated"
-#~ msgstr "%(filetype)s tiedostonimeä ei voitu luoda"
-
-#, python-format
-#~ msgid "Could not open %(filetype)s"
-#~ msgstr "%(filetype)s avaaminen epäonnistui"
-
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times:"
-#~ msgstr ""
-#~ "Kuvia samalla tiedostonimellä löydetty, mutta kuvat on otettu eri aikoina:"
-
-#, python-format
-#~ msgid "The %(filetype)s was not copied."
-#~ msgstr "%(filetype)s ei kopioitu"
-
-#, python-format
-#~ msgid ""
-#~ "First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Ensimmäinen kuva: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Toinen kuva: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
-#~ msgid "Video skipped"
-#~ msgstr "Video ohitettiin"
-
-#~ msgid "Video already exists"
-#~ msgstr "Video on jo olemassa"
-
-#, python-format
-#~ msgid "%(filetype)s has no metadata"
-#~ msgstr "%(filetype)s ei sisällä metatietoja"
-
-#, python-format
-#~ msgid "%s metadata is not present"
-#~ msgstr "%s metatietoa ei ole"
-
-#~ msgid "Subsecond metadata not present in photo"
-#~ msgstr "Metatiedot eivät sisällä sekunnin osia kuvassa."
-
-#, python-format
-#~ msgid "%s metadata is not present in photo"
-#~ msgstr "%s metatietoa ei ole kuvassa"
-
-#, python-format
-#~ msgid ""
-#~ "%(filetype)s filename could not be properly generated. Check to ensure there "
-#~ "is sufficient metadata."
-#~ msgstr ""
-#~ "%(filetype)s tiedostonimeä ei voitu luoda oikein. Tarkista metatietojen "
-#~ "riittävyys."
-
-#, python-format
-#~ msgid "%s metadata is not present in video"
-#~ msgstr "%s metatietoa ei ole videossa"
-
-#~ msgid ""
-#~ "Sorry, video downloading functionality disabled. To download videos, please "
-#~ "install the <i>kaa metadata</i> package for python."
-#~ msgstr ""
-#~ "Anteeksi, videoiden lataus on otettu pois päältä. Ladataksesi videoita, "
-#~ "asenna <i>kaa metadata</i> paketti Pythonille."
-
-#, python-format
-#~ msgid "%(noFiles)s %(filetypes)s skipped"
-#~ msgstr "%(noFiles)s %(filetypes)s ohitettu"
-
-#, python-format
-#~ msgid ""
-#~ "Subfolder: %(subfolder)s\n"
-#~ "File: %(file)s\n"
-#~ "Problem: %(problem)s"
-#~ msgstr ""
-#~ "Alikansio: %(subfolder)s\n"
-#~ "Tiedosto: %(file)s\n"
-#~ "Ongelma: %(problem)s"
-
-#~ msgid "Photo thumbnail could not be extracted"
-#~ msgstr "Kuvan esikatselukuvaa ei saatu"
-
-#~ msgid "Photo already exists"
-#~ msgstr "Kuva on jo olemassa"
-
-#~ msgid "Photo skipped"
-#~ msgstr "Kuva ohitettu"
-
-#~ msgid "No backup device was automatically detected"
-#~ msgstr "Varmuuskopiolaitetta ei löydetty automaattisesti"
-
-#~ msgid "videos skipped"
-#~ msgstr "videota ohitettu"
-
-#~ msgid "videos downloaded"
-#~ msgstr "videota ladattu"
-
-#~ msgid "photos skipped"
-#~ msgstr "kuvaa ohitettu"
-
-#~ msgid "photos downloaded"
-#~ msgstr "kuvaa ladattu"
-
-#, python-format
-#~ msgid ""
-#~ "Metadata is essential for generating subfolder and/or file names.\n"
-#~ "Source: %s"
-#~ msgstr ""
-#~ "Metatiedot ovat välttämättömiä alikansioiden ja/tai tiedostonimien "
-#~ "luomiseksi.\n"
-#~ "Lähde: %s"
-
-#~ msgid ""
-#~ "Subfolder name could not be properly generated. Check to ensure there is "
-#~ "sufficient metadata."
-#~ msgstr "Alikansion nimeä ei voitu luoda. Tarkista metatietojen riittävyys."
-
-#~ msgid "extension was specified but filename does not have an extension"
-#~ msgstr "pääte määritetty, mutta tiedostonimessä ei ole päätettä"
-
-#~ msgid "image or video number was specified but filename has no number"
-#~ msgstr ""
-#~ "kuvan tai videon numero määritetty, mutta tiedostonimessä ei ole numeroa"
-
-#~ msgid ""
-#~ "Choose whether to skip downloading the file, or to add a unique indentifier."
-#~ msgstr ""
-#~ "Valitse ohitetaanko tiedoston lataus vai lisätäänkö siihen yksilöllinen "
-#~ "tunniste."
-
-#~ msgid ""
-#~ "Specify what to do when a photo or video of the same name has already been "
-#~ "downloaded or backed up."
-#~ msgstr ""
-#~ "Määrittele mitä tehdään kun saman niminen kuva tai video on jo ladattu tai "
-#~ "varmuuskopioitu."
+#~ msgid "'Start of day' preference value is corrupted.\n"
+#~ msgstr "'Päivän alku'-asetuksen arvo on virheellinen.\n"
 
-#~ msgid "Preview"
-#~ msgstr "Esikatselu"
+#~ msgid "Sorry,these preferences contain an error:\n"
+#~ msgstr "Anteeksi, näissä määrityksissä on virhe:\n"
diff --git a/po/fr.po b/po/fr.po
index 37f5f5a..2b34892 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,22 +8,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-06-23 04:00-0500\n"
-"PO-Revision-Date: 2012-11-16 10:27+0000\n"
-"Last-Translator: Olivier Devineau <Unknown>\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:17+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Français <null>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-26 19:04+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -32,33 +32,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:119
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:122
+#: rapid/rapid.py:127
 #, 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:157
+#: rapid/rapid.py:162
 msgid "Device"
 msgstr "Périphérique"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:175
+#: rapid/rapid.py:180
 msgid "Size"
 msgstr "Taille"
 
-#: rapid/rapid.py:178
+#: rapid/rapid.py:183
 msgid "Download Progress"
 msgstr "Progression du transfert"
 
-#: rapid/rapid.py:336
+#: rapid/rapid.py:343
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "Le périphérique %(device)s n'a pas été démonté"
@@ -67,22 +67,22 @@ msgstr "Le périphérique %(device)s n'a pas été démonté"
 #. looking for photos or videos. It is visible initially in the progress bar for each device
 #. (which normally holds "x photos and videos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1216
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr "Détection en cours..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1782
+#: rapid/rapid.py:1818
 msgid "the root of the file system"
 msgstr "Partition racine"
 
 #. message in dialog box which asks the user if they really want to be downloading from this location
-#: rapid/rapid.py:1786
+#: rapid/rapid.py:1822
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Transfert depuis %(location)s."
 
-#: rapid/rapid.py:1787
+#: rapid/rapid.py:1823
 msgid ""
 "Do you really want to download from here? On some systems, scanning this "
 "location can take a very long time."
@@ -90,15 +90,15 @@ msgstr ""
 "Êtes-vous sûr de vouloir transférer depuis cet emplacement ? Sur certains "
 "systèmes, la recherche de photos ou de vidéos peut prendre du temps."
 
-#: rapid/rapid.py:2209
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr "Transférer"
 
-#: rapid/rapid.py:2212
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr "Pause"
 
-#: rapid/rapid.py:2317
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -109,7 +109,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2320
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -118,176 +118,187 @@ msgstr ""
 "Ce répertoire de destination n'est pas valide:\n"
 "%s"
 
-#: rapid/rapid.py:2321
+#: rapid/rapid.py:2380
 msgid "Download cannot proceed"
 msgstr "Impossible de procéder au transfert"
 
-#: rapid/rapid.py:2700
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "photos"
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "vidéos"
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr ""
+
+#: rapid/rapid.py:2802
 msgid "About 1 second remaining"
 msgstr "Environ 1 seconde restante"
 
-#: rapid/rapid.py:2702
+#: rapid/rapid.py:2804
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Environ %i secondes restantes"
 
-#: rapid/rapid.py:2704
+#: rapid/rapid.py:2806
 msgid "About 1 minute remaining"
 msgstr "Environ 1 minute restante"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:2709
+#: rapid/rapid.py:2811
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Environ %(minutes)i:%(seconds)02i restantes"
 
-#: rapid/rapid.py:2731 rapid/rpdfile.py:123
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
 msgid "photos and videos"
 msgstr "photos et vidéos"
 
-#: rapid/rapid.py:2733 rapid/rpdfile.py:125
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
 msgid "photos or videos"
 msgstr "photos ou vidéos"
 
-#: rapid/rapid.py:2736 rapid/rapid.py:3558 rapid/rpdfile.py:128
-msgid "videos"
-msgstr "vidéos"
-
-#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
-#: rapid/rpdfile.py:291
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
 msgid "video"
 msgstr "vidéo"
 
-#: rapid/rapid.py:2741 rapid/rapid.py:3556 rapid/rpdfile.py:133
-msgid "photos"
-msgstr "photos"
-
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2743 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
-#: rapid/rpdfile.py:272
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
 msgid "photo"
 msgstr "photo"
 
-#: rapid/rapid.py:2770
+#: rapid/rapid.py:2872
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s transférés"
 
-#: rapid/rapid.py:2774
+#: rapid/rapid.py:2876
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "erreur lors du transfert de %(noFiles)s %(filetypes)s"
 
-#: rapid/rapid.py:2777 rapid/rapid.py:2829
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
 msgid "warnings"
 msgstr "avertissements"
 
-#: rapid/rapid.py:2786
+#: rapid/rapid.py:2892
 msgid "All downloads complete"
 msgstr "Tous les transferts sont terminés"
 
-#: rapid/rapid.py:2792 rapid/rapid.py:2801 rapid/rapid.py:2810
-#: rapid/rapid.py:2819 rapid/rapid.py:2827
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2794 rapid/rapid.py:2812
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s téléchargé"
 
-#: rapid/rapid.py:2803 rapid/rapid.py:2821
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "Echec de transfert pour %(filetype)s"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2860
+#: rapid/rapid.py:2970
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr "%(number)s sur %(total)s %(filetypes)s (%(remaining)s restants)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:2977
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s sur %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3222
+#: rapid/rapid.py:3331
 msgid "From"
 msgstr "Depuis"
 
-#: rapid/rapid.py:3230
+#: rapid/rapid.py:3339
 msgid "Auto Detect"
 msgstr "Détecter automatiquement"
 
-#: rapid/rapid.py:3234 rapid/preferencesdialog.py:1327
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Sélectionnez un dossier contenant %(file_types)s"
 
-#: rapid/rapid.py:3275
+#: rapid/rapid.py:3384
 msgid "Copy"
 msgstr "Copier"
 
-#: rapid/rapid.py:3288
+#: rapid/rapid.py:3397
 msgid "Move"
 msgstr "Déplacer"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3419
 msgid "To"
 msgstr "Vers"
 
-#: rapid/rapid.py:3317 rapid/rapid.py:3986
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
 msgid "Photos:"
 msgstr "Photos :"
 
-#: rapid/rapid.py:3320 rapid/preferencesdialog.py:1164
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
 msgid "Select a folder to download photos to"
 msgstr "Sélectionnez le dossier de destination"
 
-#: rapid/rapid.py:3332 rapid/rapid.py:3986
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
 msgid "Videos:"
 msgstr "Vidéos :"
 
-#: rapid/rapid.py:3334 rapid/preferencesdialog.py:1182
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
 msgid "Select a folder to download videos to"
 msgstr "Sélectionnez un dossier vers lequel transférer vos vidéos"
 
-#: rapid/rapid.py:3526
+#: rapid/rapid.py:3650
 msgid "and"
 msgstr "et"
 
-#: rapid/rapid.py:3531
+#: rapid/rapid.py:3655
 msgid "Using backup devices"
 msgstr "Utilisation des volumes de sauvegarde"
 
-#: rapid/rapid.py:3533
+#: rapid/rapid.py:3657
 msgid "Using backup device"
 msgstr "Utilisation du volume de sauvegarde"
 
-#: rapid/rapid.py:3535
+#: rapid/rapid.py:3659
 msgid "No backup devices detected"
 msgstr "Aucun volume de sauvegarde détécté"
 
-#: rapid/rapid.py:3562
+#: rapid/rapid.py:3686
 msgid "Free space:"
 msgstr "Espace libre :"
 
 #. (videos) or (photos) will be appended to the free space message displayed to the
 #. user in the status bar.
 #. you should only translate this if your language does not use parantheses
-#: rapid/rapid.py:3574
+#: rapid/rapid.py:3698
 #, 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:3578
+#: rapid/rapid.py:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -295,87 +306,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:3583
+#: rapid/rapid.py:3707
 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:3588
+#: rapid/rapid.py:3712
 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:3594
+#: rapid/rapid.py:3718
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s disponibles"
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3602
+#: rapid/rapid.py:3726
 #, python-format
 msgid "Backing up photos and videos to %(path)s"
 msgstr "Sauvegarde des photos et vidéos vers %(path)s"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3605
+#: rapid/rapid.py:3729
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Sauvegarde sur %(path)s"
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3608
+#: rapid/rapid.py:3732
 #, python-format
 msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr "Sauvegarde des photos vers %(path)s et des vidéos vers %(path2)s"
 
-#: rapid/rapid.py:3615
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3644
+#: rapid/rapid.py:3768
 msgid "Program preferences are invalid"
 msgstr "Les préférences de l'application sont invalides"
 
-#: rapid/rapid.py:3770 rapid/rpdfile.py:273
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
 msgid "Photo"
 msgstr "Photo"
 
-#: rapid/rapid.py:3772 rapid/rpdfile.py:292
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "Vidéo"
 
-#: rapid/rapid.py:3781
+#: rapid/rapid.py:3921
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s répertoires de destination n'existe pas"
 
-#: rapid/rapid.py:3783 rapid/rapid.py:3797 rapid/rapid.py:3810
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
 msgid "Folder: %s"
 msgstr "Répertoire: %s"
 
-#: rapid/rapid.py:3795
+#: rapid/rapid.py:3935
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s répertoire de destination n'est pas valide"
 
-#: rapid/rapid.py:3808
+#: rapid/rapid.py:3948
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s répertoire de destination protégé en écriture"
 
-#: rapid/rapid.py:3894
+#: rapid/rapid.py:4034
 msgid "Thumbnails"
 msgstr "Aperçus"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3949
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -384,21 +395,21 @@ msgstr ""
 "affiche les informations de l'application sur la ligne de commande lorsque "
 "l'application est active (défaut: %default)"
 
-#: rapid/rapid.py:3950
+#: rapid/rapid.py:4090
 msgid "display debugging information when run from the command line"
 msgstr "Affiche les informations de débogage en mode console"
 
-#: rapid/rapid.py:3951
+#: rapid/rapid.py:4091
 msgid "only output errors to the command line"
 msgstr "n'affiche que les erreurs sur la ligne de commande"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3953
+#: rapid/rapid.py:4093
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 "Liste des extensions de fichiers photo et vidéo reconnues par le programme"
 
-#: rapid/rapid.py:3955
+#: rapid/rapid.py:4095
 msgid ""
 "automatically detect devices from which to download, overwriting existing "
 "program preferences"
@@ -406,7 +417,7 @@ msgstr ""
 "Détecter automatiquement les périphériques à partir desquels télécharger, "
 "écraser les préférences du programme"
 
-#: rapid/rapid.py:3956
+#: rapid/rapid.py:4096
 msgid ""
 "manually specify the PATH of the device from which to download, overwriting "
 "existing program preferences"
@@ -414,11 +425,11 @@ msgstr ""
 "Spécifier manuellement le chemin des périphériques à partir desquels "
 "télécharger, écraser les préférences du programme"
 
-#: rapid/rapid.py:3957
+#: rapid/rapid.py:4097
 msgid "reset all program settings and preferences and exit"
 msgstr "Réinitialise tous les paramètres et préférences du programme"
 
-#: rapid/rapid.py:3970
+#: rapid/rapid.py:4110
 msgid ""
 "Error: specify device auto-detection or manually specify a device's path "
 "from which to download, but do not do both."
@@ -426,25 +437,26 @@ msgstr ""
 "Erreur: activez l'auto-détection ou spécifiez manuellement un chemin pour "
 "les périphériques à partir desquels télécharger mais ne faites pas les deux."
 
-#: rapid/rapid.py:3991
+#: rapid/rapid.py:4133
 #, python-format
 msgid "and %s"
 msgstr "et %s"
 
-#: rapid/rapid.py:3999
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
 msgstr "Tous les paramètres et préférences ont été réinitialisés"
 
-#: rapid/backupfile.py:157 rapid/backupfile.py:180
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
 msgid "Backing up error"
 msgstr "Erreur lors de la sauvegarde"
 
-#: rapid/backupfile.py:159
+#: rapid/backupfile.py:151
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Le dossier de destination n'a pas pu être créé %(directory)s\n"
 
-#: rapid/backupfile.py:161 rapid/backupfile.py:182 rapid/subfolderfile.py:199
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -453,13 +465,29 @@ msgstr ""
 "Source : %(source)s\n"
 "Destination : %(destination)s"
 
-#: rapid/backupfile.py:164 rapid/backupfile.py:184
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Erreur : %(inst)s"
 
-#: rapid/copyfiles.py:163 rapid/subfolderfile.py:214
-#: rapid/subfolderfile.py:347 rapid/subfolderfile.py:365
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -468,6 +496,10 @@ msgstr ""
 "%(problem)s\n"
 "Fichier: %(file)s"
 
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr ""
+
 #: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Périphérique détecté"
@@ -958,20 +990,20 @@ msgstr ""
 msgid "Path:"
 msgstr "Emplacement :"
 
-#: rapid/preferencesdialog.py:1082
+#: rapid/preferencesdialog.py:1092
 msgid "Job Code"
 msgstr "Code Tâche"
 
-#: rapid/preferencesdialog.py:1353
+#: rapid/preferencesdialog.py:1363
 msgid "Select a folder in which to backup photos"
 msgstr "Choisissez un dossier dans lequel sauvegarder les photos"
 
-#: rapid/preferencesdialog.py:1366
+#: rapid/preferencesdialog.py:1376
 msgid "Select a folder in which to backup videos"
 msgstr "Choisissez un dossier dans lequel sauvegarder les vidéos"
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/preferencesdialog.py:1461
+#: rapid/preferencesdialog.py:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -979,7 +1011,7 @@ msgstr ""
 "<i><b>Attention :</b> Il n'y a pas assez de métadonnées pour générer "
 "correctement le nom. Utilisez d'autres options de renommage.</i>"
 
-#: rapid/preferencesdialog.py:1512
+#: rapid/preferencesdialog.py:1524
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -989,13 +1021,13 @@ msgstr ""
 "nommer les sous-dossiers.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/preferencesdialog.py:1515
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Exemple : %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1605
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -1006,7 +1038,7 @@ msgstr ""
 "être utilisées.\n"
 "Elles vont être réinitialiseées à leurs valeurs par défaut."
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1762
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -1017,7 +1049,7 @@ msgstr ""
 "vous ne les corrigez pas :\n"
 "%s"
 
-#: rapid/preferencesdialog.py:1752
+#: rapid/preferencesdialog.py:1764
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -1028,17 +1060,17 @@ msgstr ""
 "corrigez pas :\n"
 "%s"
 
-#: rapid/preferencesdialog.py:1753
+#: rapid/preferencesdialog.py:1765
 msgid "Invalid regular expression"
 msgstr "Expression rationnelle non valide"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1934
+#: rapid/preferencesdialog.py:1949
 msgid "externaldrive1"
 msgstr "disqueexterne1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1936
+#: rapid/preferencesdialog.py:1951
 msgid "externaldrive2"
 msgstr "disqueexterne2"
 
@@ -1115,55 +1147,60 @@ msgid "Stockholm"
 msgstr "Stockholm"
 
 #. components
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:358
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
 msgstr "sous-dossier"
 
-#: rapid/problemnotification.py:28 rapid/subfolderfile.py:356
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr "nom de fichier"
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr "La valeur de date et heure %s semble non valable."
 
-#: rapid/problemnotification.py:82
+#: rapid/problemnotification.py:86
 msgid "Filename does not have an extension."
 msgstr "Le nom de fichier n'a pas d'extension."
 
 #. a number component is something like the 8346 in IMG_8346.JPG
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:88
 msgid "Filename does not have a number component."
 msgstr "Le nom du fichier n'a pas de composante unique."
 
-#: rapid/problemnotification.py:85
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr "Erreur lors de la génération de la composante %s."
 
 #. a generic problem
-#: rapid/problemnotification.py:87
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr "%(filetype)s metadonné(e) illisible(s)"
 
-#: rapid/problemnotification.py:89
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "%(filetype)s %(area)s n'a pu être généré"
 
-#: rapid/problemnotification.py:91 rapid/problemnotification.py:92
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr "Une erreur s'est produite lors de la copie de %(filetype)s"
 
-#: rapid/problemnotification.py:94 rapid/problemnotification.py:95
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr ""
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "%(filetype)s existe déjà"
 
-#: rapid/problemnotification.py:98
+#: rapid/problemnotification.py:105
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1172,7 +1209,7 @@ msgstr ""
 "%(filetype)s n'a pu être sauvegardé car aucun emplacement approprié nà pu "
 "être trouvé."
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:110
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -1181,12 +1218,12 @@ msgstr ""
 "%(image1)s a été prise le %(image1_date)s à %(image1_time)s, et %(image2)s "
 "le %(image2_date)s à %(image2_time)s."
 
-#: rapid/problemnotification.py:104
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "%(filetype)s a déjà été transféré"
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:115
 #, python-format
 msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
@@ -1195,28 +1232,34 @@ msgstr ""
 "La dernière modification du fichier existant %(filetype)s a été effectuée le "
 "%(date)s à %(time)s. L'identifiant unique '%(identifier)s' ajouté."
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:116
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 "La dernière modification du fichier existant %(filetype)s a été effectuée le "
 "%(date)s à %(time)s."
 
-#: rapid/problemnotification.py:110
+#: rapid/problemnotification.py:117
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr "Il n'y a aucune donnée pour nommer le %(filetype)s."
 
-#: rapid/problemnotification.py:112
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Erreur : %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:202
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr "Les métadonnées sont peut-être corrompues"
 
-#: rapid/problemnotification.py:205
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
@@ -1224,28 +1267,28 @@ msgstr ""
 "Le nom de fichier, l'extension et l'information Exif indiquent qu'il a déjà "
 "été transféré."
 
-#: rapid/problemnotification.py:224
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " Il a été archivé sur %(volume)s"
 
-#: rapid/problemnotification.py:226
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr " Il a été archivé sur ce périphérique : "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:229 rapid/problemnotification.py:290
-#: rapid/problemnotification.py:302
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s et %(final_volume)s."
 
-#: rapid/problemnotification.py:241
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
@@ -1254,268 +1297,319 @@ msgstr ""
 "Des photos ayant des noms de fichiers indentiques mais ayant été prises à "
 "des moments différents ont été détectées : %(details)s"
 
-#: rapid/problemnotification.py:258
+#: rapid/problemnotification.py:269
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr ""
 "Une erreur c'est produite lors de l'archivage sur %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:260
+#: rapid/problemnotification.py:271
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr "Une erreur c'est produite lors de l'archivage sur %(volume)s."
 
-#: rapid/problemnotification.py:262
+#: rapid/problemnotification.py:273
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr ""
 "Des erreurs se sont produites lors de la sauvegarde sur le volume de "
 "sauvegarde suivant : "
 
-#: rapid/problemnotification.py:266 rapid/problemnotification.py:314
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:268
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:272 rapid/problemnotification.py:316
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr "%(volumes)s et %(volume)s (%(inst)s)."
 
-#: rapid/problemnotification.py:277
+#: rapid/problemnotification.py:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s et %(volume)s."
 
-#: rapid/problemnotification.py:285
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "Une sauvegarde existe déjà sur %(volume)s."
 
-#: rapid/problemnotification.py:287
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr "Des sauvegardes existent déjà aux emplacements suivants : "
 
-#: rapid/problemnotification.py:297
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "Sauvegarde écrasée sur %(volume)s."
 
-#: rapid/problemnotification.py:299
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr "Sauvegardes écrasées sur les périphériques suivants : "
 
-#: rapid/problemnotification.py:310
+#: rapid/problemnotification.py:321
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr ""
 "Une erreur s'est produite lors de la création des répertoires sur "
 "%(volume)s : %(inst)s."
 
-#: rapid/problemnotification.py:312
+#: rapid/problemnotification.py:323
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 "Des erreurs se sont produites lors de la création des répertoires sur les "
 "volume de sauvegarde suivants : "
 
-#: rapid/problemnotification.py:323
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "%(previousproblem)s Ainsi que, %(newproblem)s"
 
-#: rapid/problemnotification.py:331
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " En outre, il y avait des %(problems)s."
 
-#: rapid/problemnotification.py:333
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " En outre, il y avait un %(problem)s."
 
-#: rapid/problemnotification.py:342
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Le %(type)s de métadonnées est manquant."
 
-#: rapid/problemnotification.py:344
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr "la métadonnée suivante est manquante: "
 
-#: rapid/problemnotification.py:347
+#: rapid/problemnotification.py:371
 #, python-format
 msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr "%(missing_metadata_elements)s et %(final_missing_metadata_element)s."
 
-#: rapid/problemnotification.py:364
+#: rapid/problemnotification.py:388
 msgid "Problems in subfolder and filename generation"
 msgstr "Problème lors de la génération du sous-dossier et du nom de fichier"
 
-#: rapid/problemnotification.py:366
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr "Problème lors de la génération du sous-dossier et du nom de fichier"
 
-#: rapid/problemnotification.py:369
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Problèmes lors de la génération de %s"
 
-#: rapid/problemnotification.py:371
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Problème lors de la génération de %s"
 
-#: rapid/problemnotification.py:380
+#: rapid/problemnotification.py:404
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr "%(filetype)s existe déjà, mais cela a été archivé"
 
-#: rapid/problemnotification.py:382
+#: rapid/problemnotification.py:406
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 "Une erreur s'est produite lors de la copie de %(filetype)s, mais cela a été "
 "archivé"
 
-#: rapid/problemnotification.py:402
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr "Plusieurs problèmes ont été rencontrés"
 
-#: rapid/problemnotification.py:404 rapid/subfolderfile.py:233
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 "Des photos portant le même nom mais prises à différents moments ont été "
 "détectées"
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr "il y a eu des erreurs lors de la sauvegarde"
 
-#: rapid/problemnotification.py:411
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr "Il y a eu des erreurs lors de la sauvegarde"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr "il y a eu une erreur lors de la sauvegarde"
 
-#: rapid/problemnotification.py:414
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr "Il y a eu une erreur lors de la sauvegarde"
 
 #. e.g.
-#: rapid/problemnotification.py:417
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, et %(backinguperror)s"
 
-#: rapid/rpdfile.py:153
+#: rapid/rpdfile.py:159
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/rpdfile.py:163
+#: rapid/rpdfile.py:169
 #, python-format
 msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 msgstr "Lecture en cours: %(photos)s photos et %(videos)s vidéos trouvées"
 
-#: rapid/subfolderfile.py:80
+#: rapid/subfolderfile.py:81
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr "Sous-dossier et nom de fichier"
+
+#: rapid/subfolderfile.py:406
 msgid "Photo has already been downloaded"
 msgstr "La photo a déjà été transférée"
 
-#: rapid/subfolderfile.py:302
+#: rapid/subfolderfile.py:407
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Source : %(source)s"
 
-#: rapid/subfolderfile.py:354
-msgid "subfolder and filename"
-msgstr "Sous-dossier et nom de fichier"
-
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:485
 msgid "Failed to create download subfolder"
 msgstr "Echec de création de sous-répertoire de destination"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:486
 #, python-format
 msgid "Path: %s"
 msgstr "Chemin: %s"
 
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr "À propos..."
+
 #: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
+msgstr "Tout _cocher"
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr "Sélectionner toutes les photos"
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr "sélectionner toutes les vidéos"
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "Faire un don..."
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr "Aide en li_gne..."
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr "Aide"
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
+msgstr "Préférences"
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
+msgstr "Quitter"
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
+msgstr "Actualiser"
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr "_Rapporter un problème..."
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
+msgstr "Traduire cette application…"
+
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr "To_ut déselectionner"
+
+#: rapid/glade3/rapid.ui.h:16
 msgid "_File"
 msgstr "_Fichier"
 
-#: rapid/glade3/rapid.ui.h:3
+#: rapid/glade3/rapid.ui.h:17
 msgid "Download / Pause"
 msgstr "Transfert / Pause"
 
-#: rapid/glade3/rapid.ui.h:4
+#: rapid/glade3/rapid.ui.h:18
 msgid "_Select"
 msgstr "_Sélection"
 
-#: rapid/glade3/rapid.ui.h:5
+#: rapid/glade3/rapid.ui.h:19
 msgid "Select All Without _Job Code"
 msgstr "Séléctionner tous les fichiers n'ayant pas d'étiquette de transfert"
 
-#: rapid/glade3/rapid.ui.h:6
+#: rapid/glade3/rapid.ui.h:20
 msgid "Select All Wit_h Job Code"
 msgstr "Séléctionner tous les fic_hiers ayant une étiquette de transfert"
 
-#: rapid/glade3/rapid.ui.h:7
+#: rapid/glade3/rapid.ui.h:21
 msgid "_View"
 msgstr "_Voir"
 
-#: rapid/glade3/rapid.ui.h:8
+#: rapid/glade3/rapid.ui.h:22
 msgid "_Error Log"
 msgstr "Journal des _erreurs"
 
-#: rapid/glade3/rapid.ui.h:9
+#: rapid/glade3/rapid.ui.h:23
 msgid "_Clear Completed Downloads"
 msgstr "_Effacer les transferts terminés"
 
-#: rapid/glade3/rapid.ui.h:10
+#: rapid/glade3/rapid.ui.h:24
 msgid "Previous File"
 msgstr "Fichier précédent"
 
-#: rapid/glade3/rapid.ui.h:11
+#: rapid/glade3/rapid.ui.h:25
 msgid "Next File"
 msgstr "Fichier suivant"
 
-#: rapid/glade3/rapid.ui.h:12
+#: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
 msgstr "_Aide"
 
-#: rapid/glade3/rapid.ui.h:13
-msgid "_Make a Donation..."
-msgstr "Faire un don..."
-
-#: rapid/glade3/rapid.ui.h:14
+#: rapid/glade3/rapid.ui.h:27
 msgid "_Translate this Application..."
 msgstr "_Traduire cette application..."
 
-#: rapid/glade3/rapid.ui.h:15
-msgid "_Check All"
-msgstr "Tout _cocher"
-
-#: rapid/glade3/rapid.ui.h:16
-msgid "_Uncheck All"
-msgstr "To_ut déselectionner"
-
-#: rapid/glade3/rapid.ui.h:17
+#: rapid/glade3/rapid.ui.h:28
 msgid "_Include in download"
 msgstr "_Inclure dans le transfert"
 
-#: rapid/glade3/rapid.ui.h:18
+#: rapid/glade3/rapid.ui.h:29
 msgid "_Download"
 msgstr "_Transférer"
 
@@ -1847,7 +1941,7 @@ msgstr ""
 "dès lors qu'elles sont transférées, sur différents disques durs par exemple."
 
 #: rapid/glade3/prefs.ui.h:69
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr "Sauvegarder les photos et les vidéos lors du transfert"
 
 #: rapid/glade3/prefs.ui.h:70
@@ -1890,8 +1984,8 @@ msgid "Video backup location:"
 msgstr "Emplacement de sauvegarde des vidéos :"
 
 #: rapid/glade3/prefs.ui.h:79
-msgid "Backup"
-msgstr "Sauvegarde"
+msgid "Back up"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:80
 msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
@@ -1927,35 +2021,39 @@ msgstr ""
 msgid "Automatically rotate JPEG images"
 msgstr "Pivoter automatiquement les images au format JPEG"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:90
 msgid "Performance"
 msgstr "Performance"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:91
 msgid "Generate thumbnails (slower)"
 msgstr "Générer les aperçus (plus lent)"
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:92
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Gestion des erreurs</span>"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Photo et Vidéo Conflits de noms</b>"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Add unique identifier"
 msgstr "Ajouter un identifiant unique"
 
-#: rapid/glade3/prefs.ui.h:94
+#: rapid/glade3/prefs.ui.h:96
 msgid "Skip download"
 msgstr "Passer le transfert"
 
-#: rapid/glade3/prefs.ui.h:95
+#: rapid/glade3/prefs.ui.h:97
 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."
@@ -1964,7 +2062,7 @@ msgstr ""
 "choisissez si vous souhaitez sauter le transfert ou si vous préférez ajouter "
 "un identifiant unique."
 
-#: rapid/glade3/prefs.ui.h:96
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1972,15 +2070,15 @@ msgstr ""
 "Lors de l'archivage, choisir s'il faut écraser ou passer un fichier ayant le "
 "même nom sur le volume de sauvegarde."
 
-#: rapid/glade3/prefs.ui.h:97
+#: rapid/glade3/prefs.ui.h:99
 msgid "Overwrite"
 msgstr "Écraser"
 
-#: rapid/glade3/prefs.ui.h:98
+#: rapid/glade3/prefs.ui.h:100
 msgid "Skip"
 msgstr "Passer"
 
-#: rapid/glade3/prefs.ui.h:99
+#: rapid/glade3/prefs.ui.h:101
 msgid "Error Handling"
 msgstr "Gestion des erreurs"
 
@@ -2243,6 +2341,9 @@ msgstr "Transférez vos photos et vidéos de façon simple et fiable"
 #~ msgid "Automation"
 #~ msgstr "Automatisation"
 
+#~ msgid "Backup"
+#~ msgstr "Sauvegarde"
+
 #~ msgid "Backup folder name:"
 #~ msgstr "Nom du dossier de sauvegarde :"
 
@@ -2461,9 +2562,6 @@ msgstr "Transférez vos photos et vidéos de façon simple et fiable"
 #~ msgstr ""
 #~ "Démarrage des téléchargements qui ont attendu une étiquette de transfert"
 
-#~ msgid "_Report a Problem..."
-#~ msgstr "_Rapporter un problème..."
-
 #, python-format
 #~ msgid "%s selected for downloading from"
 #~ msgstr "%s a été séléctionné comme source de transfert"
@@ -2641,9 +2739,6 @@ msgstr "Transférez vos photos et vidéos de façon simple et fiable"
 #~ msgstr ""
 #~ "Spécifiez quelle action appliquer quand il n'y a aucun volume de sauvegarde."
 
-#~ msgid "_Get Help Online..."
-#~ msgstr "Aide en li_gne..."
-
 #~ msgid "_Thumbnails"
 #~ msgstr "Vigne_ttes"
 
diff --git a/po/hr.po b/po/hr.po
index 6003ae9..f20fbba 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,1922 +7,2101 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-28 02:49-0600\n"
-"PO-Revision-Date: 2011-01-01 13:54+0000\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:14+0000\n"
 "Last-Translator: Miroslav Matejaš <silverspace@ubuntu-hr.org>\n"
 "Language-Team: Croatian <hr@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-03-20 22:12+0000\n"
-"X-Generator: Launchpad (build 12617)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:124 rapid/rapid.py:6468 rapid/glade3/rapid.glade.h:71
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:461
-msgid "New York"
-msgstr "New York"
-
-#: rapid/rapid.py:462
-msgid "Manila"
-msgstr "Manila"
-
-#: rapid/rapid.py:462
-msgid "Prague"
-msgstr "Prag"
-
-#: rapid/rapid.py:462
-msgid "Helsinki"
-msgstr "Helsinki"
-
-#: rapid/rapid.py:462
-msgid "Wellington"
-msgstr "Wellington"
-
-#: rapid/rapid.py:463
-msgid "Tehran"
-msgstr "Teheran"
-
-#: rapid/rapid.py:463
-msgid "Kampala"
-msgstr "Kampala"
-
-#: rapid/rapid.py:463
-msgid "Paris"
-msgstr "Pariz"
-
-#: rapid/rapid.py:463
-msgid "Berlin"
-msgstr "Berlin"
-
-#: rapid/rapid.py:463
-msgid "Sydney"
-msgstr "Sydney"
-
-#: rapid/rapid.py:464
-msgid "Budapest"
-msgstr "Budimpešta"
-
-#: rapid/rapid.py:464
-msgid "Rome"
-msgstr "Rim"
-
-#: rapid/rapid.py:464
-msgid "Moscow"
-msgstr "Moskva"
-
-#: rapid/rapid.py:464
-msgid "Delhi"
-msgstr "Delhi"
+#: rapid/rapid.py:122
+#, python-format
+msgid ""
+"%(date)s\n"
+"%(time)s"
+msgstr ""
 
-#: rapid/rapid.py:464
-msgid "Warsaw"
-msgstr "Varšava"
+#: rapid/rapid.py:124
+#, python-format
+msgid "%(date)s %(time)s"
+msgstr ""
 
-#: rapid/rapid.py:465
-msgid "Jakarta"
-msgstr "Jakarta"
+#: rapid/rapid.py:127
+#, python-format
+msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgstr ""
 
-#: rapid/rapid.py:465
-msgid "Madrid"
-msgstr "Madrid"
+#. Device refers to a thing like a camera, memory card in its reader,
+#. external hard drive, Portable Storage Device, etc.
+#: rapid/rapid.py:162
+msgid "Device"
+msgstr "Uređaj"
 
-#: rapid/rapid.py:465
-msgid "Stockholm"
-msgstr "Stockholm"
+#. Size refers to the total size of images on the device, typically in
+#. MB or GB
+#: rapid/rapid.py:180
+msgid "Size"
+msgstr "Veličina"
 
-#: rapid/rapid.py:499
-msgid "Invalid Downloads Today value.\n"
-msgstr ""
+#: rapid/rapid.py:183
+msgid "Download Progress"
+msgstr "Napredak preuzimanja"
 
-#: rapid/rapid.py:500
-msgid "Resetting value to zero.\n"
+#: rapid/rapid.py:343
+#, python-format
+msgid "%(device)s did not unmount"
 msgstr ""
 
-#: rapid/rapid.py:539
-msgid "'Start of day' preference value is corrupted.\n"
-msgstr ""
+#. This refers to when a device like a hard drive is having its contents scanned,
+#. looking for photos or videos. It is visible initially in the progress bar for each device
+#. (which normally holds "x photos and videos").
+#. It maybe displayed only briefly if the contents of the device being scanned is small.
+#: rapid/rapid.py:1241
+msgid "scanning..."
+msgstr "pretražujem..."
 
-#: rapid/rapid.py:540
-msgid "Resetting to midnight.\n"
+#. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
+#: rapid/rapid.py:1818
+msgid "the root of the file system"
 msgstr ""
 
-#: rapid/rapid.py:566
-msgid "Error in Photo Rename preferences"
+#. message in dialog box which asks the user if they really want to be downloading from this location
+#: rapid/rapid.py:1822
+#, python-format
+msgid "Downloading from %(location)s."
 msgstr ""
 
-#: rapid/rapid.py:598 rapid/rapid.py:1720
-msgid "Sorry,these preferences contain an error:\n"
+#: rapid/rapid.py:1823
+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:609
-msgid "Resetting to default values."
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
+msgid "Download"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:684 rapid/renamesubfolderprefs.py:198
-msgid "Job code"
+#: rapid/rapid.py:2270
+msgid "Pause"
 msgstr ""
 
-#: rapid/rapid.py:752
-msgid "Error in Video Rename preferences"
+#: rapid/rapid.py:2376
+#, python-format
+msgid ""
+"These download folders are invalid:\n"
+"%(folder1)s\n"
+"%(folder2)s"
 msgstr ""
 
-#: rapid/rapid.py:770
-msgid "Error in Photo Download Subfolders preferences"
+#: rapid/rapid.py:2379
+#, python-format
+msgid ""
+"This download folder is invalid:\n"
+"%s"
 msgstr ""
 
-#: rapid/rapid.py:787
-msgid "Error in Video Download Subfolders preferences"
-msgstr ""
+#: rapid/rapid.py:2380
+msgid "Download cannot proceed"
+msgstr "Preuzimanje se ne može nastaviti"
 
-#: rapid/rapid.py:820 rapid/rapid.py:1551
-msgid "photos and videos"
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
 msgstr ""
 
-#: rapid/rapid.py:822 rapid/rapid.py:1561 rapid/rapid.py:1689
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
 msgid "photos"
 msgstr "fotografije"
 
-#: rapid/rapid.py:955
-msgid "Select a folder to download photos to"
-msgstr ""
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "video snimke"
 
-#: rapid/rapid.py:973
-msgid "Select a folder to download videos to"
+#: rapid/rapid.py:2393
+msgid "Backup problem"
 msgstr ""
 
-#: rapid/rapid.py:1055
-#, python-format
-msgid "Select a folder containing %(file_types)s"
+#: rapid/rapid.py:2802
+msgid "About 1 second remaining"
 msgstr ""
 
-#: rapid/rapid.py:1077
+#: rapid/rapid.py:2804
 #, python-format
-msgid "Select a folder in which to backup %(file_types)s"
-msgstr ""
-
-#. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:1158
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
-"name. Please use other renaming options.</i>"
+msgid "About %i seconds remaining"
 msgstr ""
 
-#: rapid/rapid.py:1194
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate "
-"subfolders. Please use other subfolder naming options.</i>"
+#: rapid/rapid.py:2806
+msgid "About 1 minute remaining"
 msgstr ""
 
-#. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:1198
+#. 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:2811
 #, python-format
-msgid "<i>Example: %s</i>"
-msgstr ""
-
-#: rapid/rapid.py:1224
-msgid ""
-"Downloads today value not updated, as a download is currently occurring"
+msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr ""
 
-#: rapid/rapid.py:1240
-msgid "Stored number value not updated, as a download is currently occurring"
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
+msgid "photos and videos"
 msgstr ""
 
-#: rapid/rapid.py:1270
-#, python-format
-msgid ""
-"The %(filetype)s subfolder preferences had some unnecessary values removed."
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
+msgid "photos or videos"
 msgstr ""
 
-#. Preferences list is now empty
-#: rapid/rapid.py:1275
-#, python-format
-msgid ""
-"The %(filetype)s subfolder preferences entered are invalid and cannot be "
-"used.\n"
-"They will be reset to their default values."
-msgstr ""
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
+msgid "video"
+msgstr "video"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:1289 rapid/rapid.py:1563
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
 msgid "photo"
 msgstr "slika"
 
-#: rapid/rapid.py:1290 rapid/rapid.py:1558
-msgid "video"
-msgstr "video"
-
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1527
-msgid "externaldrive1"
+#: rapid/rapid.py:2872
+#, python-format
+msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1529
-msgid "externaldrive2"
+#: rapid/rapid.py:2876
+#, python-format
+msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: rapid/rapid.py:1553 rapid/rapid.py:1687
-msgid "photos or videos"
-msgstr ""
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
+msgid "warnings"
+msgstr "upozorenja"
 
-#: rapid/rapid.py:1556
-msgid "videos"
-msgstr "video snimke"
+#: rapid/rapid.py:2892
+msgid "All downloads complete"
+msgstr "Sva preuzimanja su završena"
 
-#: rapid/rapid.py:1568
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
-msgid ""
-"%(date)s\n"
-"%(time)s"
+msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: rapid/rapid.py:1570
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
-msgid "%(date)s %(time)s"
+msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:1573
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
-msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgid "%(filetype)s failed to download"
 msgstr ""
 
-#: rapid/rapid.py:1580
+#. e.g.: 3 of 205 photos and videos (202 remaining)
+#: rapid/rapid.py:2970
 #, python-format
-msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
-msgstr ""
-
-#: rapid/rapid.py:1608 rapid/rapid.py:2280
-msgid "subfolder and filename"
+msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr ""
 
-#: rapid/rapid.py:1610 rapid/rapid.py:2282
-msgid "filename"
-msgstr "ime datoteke"
-
-#: rapid/rapid.py:1612 rapid/rapid.py:2284
-msgid "subfolder"
+#. e.g.: 205 of 205 photos and videos
+#: rapid/rapid.py:2977
+#, python-format
+msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr ""
 
-#. This refers to when a device like a hard drive is having its contents scanned,
-#. looking for photos or videos. It is visible initially in the progress bar for each device
-#. (which normally holds "x photos and videos").
-#. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1703
-msgid "scanning..."
+#: rapid/rapid.py:3331
+msgid "From"
 msgstr ""
 
-#: rapid/rapid.py:1818
-msgid "The following download path could not be created:\n"
+#: rapid/rapid.py:3339
+msgid "Auto Detect"
 msgstr ""
 
-#: rapid/rapid.py:1819
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
-msgid "%(path)s: "
+msgid "Select a folder containing %(file_types)s"
 msgstr ""
 
-#: rapid/rapid.py:1820 rapid/rapid.py:1821 rapid/rapid.py:1836
-#: rapid/rapid.py:1837 rapid/rapid.py:2097 rapid/rapid.py:2100
-msgid "Download cannot proceed"
+#: rapid/rapid.py:3384
+msgid "Copy"
 msgstr ""
 
-#: rapid/rapid.py:1834 rapid/rapid.py:5105
-msgid "There is an error in the program preferences."
+#: rapid/rapid.py:3397
+msgid "Move"
 msgstr ""
 
-#: rapid/rapid.py:1835
-msgid ""
-"\n"
-"Please check preferences, restart the program, and try again."
+#: rapid/rapid.py:3419
+msgid "To"
 msgstr ""
 
-#. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-#. It refers to the actual number of photos that can be copied. For example, the user might see the following:
-#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
-#. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:2008
-#, python-format
-msgid "%(number)s %(filetypes)s"
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
+msgid "Photos:"
 msgstr ""
 
-#. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
-#. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-#. to the user when they run the program, signifying the number of photos found, and the device they were found on.
-#. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
-#. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
-#. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:2019
-#, python-format
-msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
-msgstr ""
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
+msgid "Select a folder to download photos to"
+msgstr "Odaberite direktorij za spremanje preuzetih fotografija"
 
-#: rapid/rapid.py:2026
-#, python-format
-msgid "Device scan complete: no %(filetypes)s found on %(device)s"
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
+msgid "Videos:"
 msgstr ""
 
-#. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:2047
-msgid "The device can now be safely removed"
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
+msgid "Select a folder to download videos to"
 msgstr ""
 
-#: rapid/rapid.py:2053
-#, python-format
-msgid "%(noFiles)s %(filetypes)s downloaded"
-msgstr ""
+#: rapid/rapid.py:3650
+msgid "and"
+msgstr "i"
 
-#: rapid/rapid.py:2056
-#, python-format
-msgid "%(noFiles)s %(filetypes)s failed to download"
+#: rapid/rapid.py:3655
+msgid "Using backup devices"
 msgstr ""
 
-#: rapid/rapid.py:2059 rapid/rapid.py:5901
-msgid "warnings"
-msgstr "upozorenja"
+#: rapid/rapid.py:3657
+msgid "Using backup device"
+msgstr ""
 
-#: rapid/rapid.py:2061 rapid/rapid.py:5905
-msgid "errors"
-msgstr "greške"
+#: rapid/rapid.py:3659
+msgid "No backup devices detected"
+msgstr ""
 
-#: rapid/rapid.py:2091
-#, python-format
-msgid "Source: %s\n"
+#: rapid/rapid.py:3686
+msgid "Free space:"
 msgstr ""
 
-#: rapid/rapid.py:2093
+#. (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:3698
 #, python-format
-msgid "Device: %s\n"
-msgstr "Uređaj: %s\n"
+msgid "(%(file_type)s)"
+msgstr ""
 
-#: rapid/rapid.py:2094
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#: rapid/rapid.py:3702
 #, python-format
-msgid "Destination: %s"
+msgid "%(free)s %(file_type)s"
 msgstr ""
 
-#: rapid/rapid.py:2095 rapid/rapid.py:2098
-msgid "Could not create temporary download directory"
+#. 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:3707
+msgid "; "
 msgstr ""
 
-#: rapid/rapid.py:2098
-msgid "Error:"
-msgstr "Greška:"
-
-#: rapid/rapid.py:2122
-msgid "Backup path does not exist"
+#. 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:3712
+msgid "."
 msgstr ""
 
-#: rapid/rapid.py:2123
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#. e.g. 14.7GB available
+#: rapid/rapid.py:3718
 #, python-format
-msgid "The path %s could not be created"
-msgstr ""
-
-#: rapid/rapid.py:2124
-msgid "No backups can occur"
+msgid "%(free)s free"
 msgstr ""
 
-#: rapid/rapid.py:2153
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3726
 #, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"%(problem)s"
+msgid "Backing up photos and videos to %(path)s"
 msgstr ""
 
-#: rapid/rapid.py:2184 rapid/rapid.py:2530 rapid/rapid.py:2565
-#: rapid/rapid.py:2593 rapid/rapid.py:2624 rapid/rapid.py:2643
+#. user manually specified backup location
+#: rapid/rapid.py:3729
 #, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
+msgid "Backing up to %(path)s"
 msgstr ""
 
-#. hopefully inst will never be None, but just to be safe...
-#: rapid/rapid.py:2199
-msgid "Please check your system and try again."
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3732
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr ""
 
-#: rapid/rapid.py:2219
-msgid "Photos detected with the same filenames, but taken at different times"
+#: rapid/rapid.py:3739
+#, python-format
+msgid "%(freespace)s. %(backuppaths)s."
 msgstr ""
 
-#: rapid/rapid.py:2259
-msgid "Photo has already been downloaded"
+#: rapid/rapid.py:3768
+msgid "Program preferences are invalid"
 msgstr ""
 
-#: rapid/rapid.py:2260 rapid/rapid.py:2659
-#, python-format
-msgid "Source: %(source)s"
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
+msgid "Photo"
 msgstr ""
 
-#. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:2458
-msgid "New day has started - resetting 'Downloads Today' sequence number"
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
+msgid "Video"
 msgstr ""
 
-#: rapid/rapid.py:2529
+#: rapid/rapid.py:3921
 #, python-format
-msgid "Backup of %(file_type)s already exists"
+msgid "%(file_type)s download folder does not exist"
 msgstr ""
 
-#: rapid/rapid.py:2533
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
-msgid "Backup %(file_type)s overwritten"
+msgid "Folder: %s"
 msgstr ""
 
-#: rapid/rapid.py:2537
+#: rapid/rapid.py:3935
 #, python-format
-msgid "%(file_type)s not backed up to %(volume)s"
+msgid "%(file_type)s download folder is invalid"
 msgstr ""
 
-#: rapid/rapid.py:2539
+#: rapid/rapid.py:3948
 #, python-format
-msgid "%(file_type)s not backed up"
+msgid "%(file_type)s download folder is not writable"
 msgstr ""
 
-#: rapid/rapid.py:2562 rapid/rapid.py:2590 rapid/rapid.py:2623
-#: rapid/rapid.py:2642
-msgid "Backing up error"
+#: rapid/rapid.py:4034
+msgid "Thumbnails"
 msgstr ""
 
-#: rapid/rapid.py:2563 rapid/rapid.py:2591
+#. 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:4089
 #, python-format
-msgid "Destination directory could not be created: %(directory)s\n"
+msgid ""
+"display program information on the command line as the program runs "
+"(default: %default)"
 msgstr ""
 
-#: rapid/rapid.py:2567 rapid/rapid.py:2626
-#, python-format
-msgid "Error: %(inst)s"
+#: rapid/rapid.py:4090
+msgid "display debugging information when run from the command line"
 msgstr ""
 
-#: rapid/rapid.py:2568 rapid/rapid.py:2596 rapid/rapid.py:2627
-#: rapid/rapid.py:2646
-#, python-format
-msgid "The %(file_type)s was not backed up."
+#: rapid/rapid.py:4091
+msgid "only output errors to the command line"
 msgstr ""
 
-#: rapid/rapid.py:2595 rapid/rapid.py:2645
-#, python-format
-msgid "Error: %(errno)s %(strerror)s"
+#. image file extensions are recognized RAW files plus TIFF and JPG
+#: rapid/rapid.py:4093
+msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 
-#: rapid/rapid.py:2658
-#, python-format
-msgid "%(file_type)s could not be backed up"
+#: rapid/rapid.py:4095
+msgid ""
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
 msgstr ""
 
-#: rapid/rapid.py:2661
-msgid "No suitable backup volume was found"
+#: rapid/rapid.py:4096
+msgid ""
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
 msgstr ""
 
-#: rapid/rapid.py:2663
-msgid "A backup location was not found"
+#: rapid/rapid.py:4097
+msgid "reset all program settings and preferences and exit"
 msgstr ""
 
-#: rapid/rapid.py:2717
-#, python-format
-msgid "This device has no %(types_searched_for)s to download from."
+#: rapid/rapid.py:4110
+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:2813
+#: rapid/rapid.py:4133
 #, python-format
-msgid "Download has started from %s"
+msgid "and %s"
 msgstr ""
 
-#: rapid/rapid.py:2817
-#, python-format
-msgid "Attempting to download %s files"
+#: rapid/rapid.py:4141
+msgid "All settings and preferences have been reset"
 msgstr ""
 
-#. reset the progress bar to update the status of this download attempt
-#: rapid/rapid.py:2849 rapid/rapid.py:2917
-#, python-format
-msgid "%(number)s of %(total)s %(filetypes)s"
-msgstr ""
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
+msgid "Backing up error"
+msgstr "Greška prilikom spremanja sigurnosne kopije"
 
-#: rapid/rapid.py:2913
+#: rapid/backupfile.py:151
 #, python-format
-msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
-msgstr ""
-
-#: rapid/rapid.py:2938 rapid/rapid.py:2942
-msgid "Could not delete photo or video from device"
+msgid "Destination directory could not be created: %(directory)s\n"
 msgstr ""
 
-#: rapid/rapid.py:2939
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
-"Photo: %(source)s\n"
-"Error: %(errno)s %(strerror)s"
+"Source: %(source)s\n"
+"Destination: %(destination)s"
 msgstr ""
+"Izvor: %(source)s\n"
+"Odredište: %(destination)s"
 
-#: rapid/rapid.py:2943
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
-msgid "Photo: %(source)s"
+msgid "Error: %(inst)s"
 msgstr ""
 
-#: rapid/rapid.py:2945
+#: rapid/backupfile.py:163
 #, python-format
-msgid "Deleted %(number)i %(filetypes)s from device"
+msgid "Backup %(file_type)s overwritten"
 msgstr ""
 
-#: rapid/rapid.py:2958
+#: rapid/backupfile.py:166
 #, python-format
-msgid "Download complete from %s"
-msgstr ""
-
-#. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:3073 rapid/rapid.py:3542
-msgid "Device"
-msgstr "Uređaj"
-
-#. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:3078 rapid/rapid.py:3531
-msgid "Size"
-msgstr "Veličina"
-
-#: rapid/rapid.py:3081
-msgid "Download Progress"
-msgstr "Napredak preuzimanja"
-
-#: rapid/rapid.py:3169
-msgid "Downloading From Cameras"
+msgid "%(file_type)s not backed up"
 msgstr ""
 
-#: rapid/rapid.py:3175
-msgid "Downloading directly from a camera may work poorly or not at all"
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
 msgstr ""
 
-#: rapid/rapid.py:3176
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
+#, python-format
 msgid ""
-"Downloading from a card reader always works and is generally much faster. It "
-"is strongly recommended to use a card reader."
+"%(problem)s\n"
+"File: %(file)s"
 msgstr ""
 
-#: rapid/rapid.py:3190
-msgid "_Show this message again"
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
 msgstr ""
 
-#: rapid/rapid.py:3225
+#: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Pronađeni uređaj"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3234
+#: 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/rapid.py:3253
+#: rapid/device.py:108
 msgid "_Remember this choice"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3290
-#, python-format
-msgid "%s selected for downloading from"
-msgstr ""
+#: rapid/downloadtracker.py:299
+msgid "MB/s"
+msgstr "MB/s"
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3293
-msgid "This device or partition will always be used to download from"
+#: rapid/generatenameconfig.py:151
+msgid "Date time"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3296
-#, python-format
-msgid "%s rejected as a download device"
-msgstr ""
+#: rapid/generatenameconfig.py:152
+msgid "Text"
+msgstr "Tekst"
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3299
-msgid "This device or partition will never be used to download from"
-msgstr ""
+#: rapid/generatenameconfig.py:153
+msgid "Filename"
+msgstr "Ime datoteke"
 
-#: rapid/rapid.py:3306
-msgid "Remove all Job Codes?"
+#: rapid/generatenameconfig.py:154
+msgid "Metadata"
 msgstr ""
 
-#: rapid/rapid.py:3323
-msgid "Should all Job Codes be removed?"
+#: 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/rapid.py:3351
-msgid "Enter a Job Code"
+#: rapid/generatenameconfig.py:157 rapid/preferencesdialog.py:577
+msgid "Job code"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3370
-msgid "Enter a new Job Code, or select a previous one"
+#: rapid/generatenameconfig.py:158
+msgid "Image date"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3373
-msgid "Enter a new Job Code"
+#: rapid/generatenameconfig.py:159
+msgid "Video date"
 msgstr ""
 
-#: rapid/rapid.py:3378 rapid/rapid.py:4640
-msgid "Job Code:"
-msgstr ""
+#: rapid/generatenameconfig.py:160
+msgid "Today"
+msgstr "Danas"
 
-#: rapid/rapid.py:3425
-msgid "Job Code entered"
-msgstr ""
+#: rapid/generatenameconfig.py:161
+msgid "Yesterday"
+msgstr "Jučer"
 
-#: rapid/rapid.py:3427
-msgid "Job Code not entered"
+#. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
+#: rapid/generatenameconfig.py:163
+msgid "Download time"
 msgstr ""
 
-#: rapid/rapid.py:3477
-msgid "Status"
-msgstr "Status"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:165
+msgid "Name + extension"
+msgstr "Naziv + ekstenzija"
 
-#: rapid/rapid.py:3485
-msgid "Type"
-msgstr "Tip"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:167
+msgid "Name"
+msgstr "Naziv"
 
-#: rapid/rapid.py:3494 rapid/rapid.py:5067 rapid/rapid.py:5069
-msgid "Photo"
-msgstr ""
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:169
+msgid "Extension"
+msgstr "Ekstenzija"
 
-#: rapid/rapid.py:3496
-msgid "File"
-msgstr "Datoteka"
+#. 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 "Broj slike"
 
-#: rapid/rapid.py:3511
-msgid "Job Code"
+#: rapid/generatenameconfig.py:172
+msgid "Video number"
 msgstr ""
 
-#: rapid/rapid.py:3521
-msgid "Date"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:174
+msgid "Aperture"
 msgstr ""
 
-#: rapid/rapid.py:3553 rapid/renamesubfolderprefs.py:194
-msgid "Filename"
-msgstr "Ime datoteke"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:176
+msgid "ISO"
+msgstr "ISO"
 
-#: rapid/rapid.py:3564
-msgid "Path"
-msgstr ""
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:178
+msgid "Exposure time"
+msgstr "Dužina ekspozicije"
 
-#: rapid/rapid.py:3974
-#, python-format
-msgid "%(filetype)s was downloaded successfully"
-msgstr ""
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:180
+msgid "Focal length"
+msgstr "Žarišna duljina"
 
-#: rapid/rapid.py:3976
-#, python-format
-msgid "%(filetype)s was not downloaded"
+#. 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 ""
 
-#: rapid/rapid.py:3978
-#, python-format
-msgid "%(filetype)s was downloaded with warnings"
-msgstr ""
+#. 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 "Model fotoaparata"
 
-#: rapid/rapid.py:3980
-#, python-format
-msgid "%(filetype)s was downloaded but there were problems backing up"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:186
+msgid "Short camera model"
 msgstr ""
 
-#: rapid/rapid.py:3982
-#, python-format
-msgid "%(filetype)s was neither downloaded nor backed up"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:188
+msgid "Hyphenated short camera model"
 msgstr ""
 
-#: rapid/rapid.py:3984
-#, python-format
-msgid "%(filetype)s is ready to be downloaded"
-msgstr ""
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:190
+msgid "Serial number"
+msgstr "Serijski broj"
 
-#: rapid/rapid.py:3986
-#, python-format
-msgid "%(filetype)s is about to be downloaded"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:192
+msgid "Shutter count"
 msgstr ""
 
-#: rapid/rapid.py:3988
-#, python-format
-msgid "%(filetype)s will be downloaded with warnings"
+#. File number currently refers to the Exif value Exif.Canon.FileNumber
+#: rapid/generatenameconfig.py:194
+msgid "File number"
 msgstr ""
 
-#: rapid/rapid.py:3990
-#, python-format
-msgid "%(filetype)s cannot be downloaded"
+#. Only the folder component of the Exif.Canon.FileNumber value
+#: rapid/generatenameconfig.py:196
+msgid "Folder only"
 msgstr ""
 
-#: rapid/rapid.py:4662
-msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
+#. The folder and file component of the Exif.Canon.FileNumber value
+#: rapid/generatenameconfig.py:198
+msgid "Folder and file"
 msgstr ""
 
-#: rapid/rapid.py:5034
-#, python-format
-msgid "%(free)s available"
-msgstr "%(free)s raspoloživo"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:200
+msgid "Owner name"
+msgstr "Ime vlasnika"
 
-#. user manually specified backup location
-#: rapid/rapid.py:5040
-#, python-format
-msgid "Backing up to %(path)s"
+#: rapid/generatenameconfig.py:201
+msgid "Codec"
 msgstr ""
 
-#: rapid/rapid.py:5045
-#, python-format
-msgid "%(freespace)s. %(backuppaths)s."
+#: rapid/generatenameconfig.py:202
+msgid "Width"
 msgstr ""
 
-#: rapid/rapid.py:5054
-#, python-format
-msgid ""
-"Sorry, this device location does not exist:\n"
-"%(path)s\n"
-"\n"
-"Please resolve the problem, or modify your preferences."
+#: rapid/generatenameconfig.py:203
+msgid "Height"
 msgstr ""
 
-#: rapid/rapid.py:5058
-msgid "Problem with Device Location Folder"
+#: rapid/generatenameconfig.py:204
+msgid "Length"
 msgstr ""
 
-#: rapid/rapid.py:5067
-msgid "Video"
+#: rapid/generatenameconfig.py:205
+msgid "Frames Per Second"
 msgstr ""
 
-#: rapid/rapid.py:5074
-#, python-format
-msgid "The %(file_type)s Download Folder does not exist.\n"
+#: rapid/generatenameconfig.py:206
+msgid "Artist"
 msgstr ""
 
-#: rapid/rapid.py:5083
-#, python-format
-msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
+#: rapid/generatenameconfig.py:207
+msgid "Copyright"
 msgstr ""
 
-#: rapid/rapid.py:5088
-msgid ""
-"Sorry, problems were encountered with your download folders. Please fix the "
-"problems or modify the preferences.\n"
-"\n"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: rapid/generatenameconfig.py:209
+msgid "Downloads today"
 msgstr ""
 
-#: rapid/rapid.py:5091
-msgid "Problem with Download Folder"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: rapid/generatenameconfig.py:211
+msgid "Session number"
 msgstr ""
 
-#: rapid/rapid.py:5093
-msgid "Problem with Download Folders"
+#. 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 ""
 
-#: rapid/rapid.py:5106
-msgid "Some preferences will be reset."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: rapid/generatenameconfig.py:215
+msgid "Stored number"
 msgstr ""
 
-#: rapid/rapid.py:5139
-msgid "Displaying warning about downloading directly from camera"
+#. 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 ""
 
-#: rapid/rapid.py:5149
-#, python-format
-msgid "Prompting whether to use %s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:219
+msgid "All digits"
 msgstr ""
 
-#: rapid/rapid.py:5176
-msgid "Prompting for Job Code"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:221
+msgid "Last digit"
 msgstr ""
 
-#: rapid/rapid.py:5180
-msgid "Already prompting for Job Code, do not prompt again"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:223
+msgid "Last 2 digits"
 msgstr ""
 
-#: rapid/rapid.py:5197
-msgid "Starting downloads"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:225
+msgid "Last 3 digits"
 msgstr ""
 
-#. autostart is true
-#: rapid/rapid.py:5201
-msgid "Starting downloads that have been waiting for a Job Code"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:227
+msgid "Last 4 digits"
 msgstr ""
 
-#: rapid/rapid.py:5248
-#, python-format
-msgid "Creating photo download folder %(folder)s"
+#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
+#: rapid/generatenameconfig.py:229
+msgid "Original Case"
 msgstr ""
 
-#: rapid/rapid.py:5253
-#, python-format
-msgid "Failed to create default photo download folder %(folder)s"
-msgstr ""
+#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
+#: rapid/generatenameconfig.py:231
+msgid "UPPERCASE"
+msgstr "VELIKA SLOVA"
 
-#: rapid/rapid.py:5257
-#, python-format
-msgid "Creating video download folder %(folder)s"
+#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
+#: rapid/generatenameconfig.py:233
+msgid "lowercase"
+msgstr "mala slova"
+
+#: rapid/generatenameconfig.py:234
+msgid "One digit"
 msgstr ""
 
-#: rapid/rapid.py:5262
-#, python-format
-msgid "Failed to create default video download folder %(folder)s"
+#: rapid/generatenameconfig.py:235
+msgid "Two digits"
 msgstr ""
 
-#: rapid/rapid.py:5287
-msgid ""
-"A newer version of this program was previously run on this computer.\n"
-"\n"
+#: rapid/generatenameconfig.py:236
+msgid "Three digits"
 msgstr ""
 
-#: rapid/rapid.py:5289
-msgid ""
-"Program preferences appear to be valid, but please check them to ensure "
-"correct operation."
+#: rapid/generatenameconfig.py:237
+msgid "Four digits"
 msgstr ""
 
-#: rapid/rapid.py:5291
-msgid "Sorry, some preferences are invalid and will be reset."
+#: rapid/generatenameconfig.py:238
+msgid "Five digits"
 msgstr ""
 
-#: rapid/rapid.py:5292
-msgid "Warning:"
+#: rapid/generatenameconfig.py:239
+msgid "Six digits"
 msgstr ""
 
-#: rapid/rapid.py:5297
-msgid ""
-"This version of the program is newer than the previously run version. "
-"Checking preferences."
+#: rapid/generatenameconfig.py:240
+msgid "Seven digits"
 msgstr ""
 
-#: rapid/rapid.py:5304
-msgid "Preferences were modified."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:242
+msgid "Subseconds"
 msgstr ""
 
-#: rapid/rapid.py:5305
-msgid ""
-"This version of the program uses different preferences than the old version. "
-"Your preferences have been updated.\n"
-"\n"
-"Please check them to ensure correct operation."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:244
+msgid "YYYYMMDD"
+msgstr "GGGGMMDD"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:246
+msgid "YYYY-MM-DD"
+msgstr "GGGG-MM-DD"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:248
+msgid "YYMMDD"
+msgstr "GGMMDD"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:250
+msgid "YY-MM-DD"
+msgstr "GG-MM-DD"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:252
+msgid "MMDDYYYY"
+msgstr "MMDDGGGG"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:254
+msgid "MMDDYY"
+msgstr "MMDDGG"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: 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:258
+msgid "DDMMYYYY"
+msgstr "DDMMGGGG"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:260
+msgid "DDMMYY"
+msgstr "DDMMGG"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:262
+msgid "YYYY"
+msgstr "GGGG"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:264
+msgid "YY"
+msgstr "GG"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: 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: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:270
+msgid "Month (full)"
 msgstr ""
 
-#: rapid/rapid.py:5309
-msgid "No preferences needed to be changed."
+#. 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 ""
 
-#: rapid/rapid.py:5311
-msgid ""
-"This version of the program uses different preferences than the old version. "
-"Some of your previous preferences were invalid, and could not be updated. "
-"They will be reset."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:274
+msgid "HHMMSS"
 msgstr ""
 
-#: rapid/rapid.py:5321
-msgid "Problem using pynotify."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:276
+msgid "HHMM"
 msgstr ""
 
-#: rapid/rapid.py:5337
-msgid "Failed to receive pynotify server capabilities."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:278
+msgid "HH-MM-SS"
 msgstr ""
 
-#: rapid/rapid.py:5348
-msgid ""
-"Warning: desktop environment notification server is incorrectly configured."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:280
+msgid "HH-MM"
 msgstr ""
 
-#: rapid/rapid.py:5396
-msgid "and"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:282
+msgid "HH"
 msgstr ""
 
-#: rapid/rapid.py:5401
-msgid "Using backup devices"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:284
+msgid "MM (minutes)"
 msgstr ""
 
-#: rapid/rapid.py:5403
-msgid "Using backup device"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:286
+msgid "SS"
 msgstr ""
 
-#: rapid/rapid.py:5405
-msgid "No backup devices detected"
+#: rapid/preferencesdialog.py:374
+#, python-format
+msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: rapid/rapid.py:5455 rapid/rapid.py:5617
+#: rapid/preferencesdialog.py:376
 #, python-format
-msgid "Device %(device)s (%(path)s) ignored"
+msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: rapid/rapid.py:5576
+#: rapid/preferencesdialog.py:380
 #, python-format
-msgid "Detected %(device)s with path %(path)s"
+msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#: rapid/rapid.py:5580
-msgid "Automatically start download is true"
+#: rapid/preferencesdialog.py:439 rapid/preferencesdialog.py:700
+msgid "Remove all Job Codes?"
 msgstr ""
 
-#: rapid/rapid.py:5582
-msgid "Automatically start download is false"
+#: rapid/preferencesdialog.py:440 rapid/preferencesdialog.py:717
+msgid "Should all Job Codes be removed?"
 msgstr ""
 
-#: rapid/rapid.py:5635
-msgid "Using manually specified path"
+#: rapid/preferencesdialog.py:446
+msgid "Remove all Remembered Paths?"
 msgstr ""
 
-#. the user is trying to backup to a device that is currently being downloaded from..... we don't normally allow that, but what to do?
-#: rapid/rapid.py:5703
-#, python-format
-msgid "Warning: backup device %(device)s is currently being downloaded from"
+#: rapid/preferencesdialog.py:447
+msgid "Should all remembered paths be removed?"
 msgstr ""
 
-#: rapid/rapid.py:5719
-msgid "D_ownload Selected"
+#: rapid/preferencesdialog.py:453
+msgid "Remove all Ignored Paths?"
 msgstr ""
 
-#: rapid/rapid.py:5822 rapid/rapid.py:5873
-msgid "All downloads complete"
+#: rapid/preferencesdialog.py:454
+msgid "Should all ignored paths be removed?"
 msgstr ""
 
-#: rapid/rapid.py:5837
-msgid "MB/s"
+#: rapid/preferencesdialog.py:465
+msgid "Error in Photo Rename preferences"
 msgstr ""
 
-#: rapid/rapid.py:5847
-msgid "About 1 second remaining"
+#: rapid/preferencesdialog.py:645
+msgid "Error in Video Rename preferences"
 msgstr ""
 
-#: rapid/rapid.py:5849
-#, python-format
-msgid "About %i seconds remaining"
+#: rapid/preferencesdialog.py:666
+msgid "Error in Photo Download Subfolders preferences"
 msgstr ""
 
-#: rapid/rapid.py:5851
-msgid "About 1 minute remaining"
+#: rapid/preferencesdialog.py:683
+msgid "Error in Video Download Subfolders preferences"
 msgstr ""
 
-#. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
-#. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
-#. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:5856
-#, python-format
-msgid "About %(minutes)i:%(seconds)02i minutes remaining"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:742
+msgid "Enter a Job Code"
 msgstr ""
 
-#: rapid/rapid.py:5876 rapid/rapid.py:5882 rapid/rapid.py:5888
-#: rapid/rapid.py:5894 rapid/rapid.py:5899 rapid/rapid.py:5903
-#, python-format
-msgid "%(number)s %(numberdownloaded)s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:758
+msgid "Enter a new Job Code, or select a previous one"
 msgstr ""
 
-#: rapid/rapid.py:5878 rapid/rapid.py:5890
-#, python-format
-msgid "%(filetype)s downloaded"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:761
+msgid "Enter a new Job Code"
 msgstr ""
 
-#: rapid/rapid.py:5884 rapid/rapid.py:5896
-#, python-format
-msgid "%(filetype)s failed to download"
+#: rapid/preferencesdialog.py:766
+msgid "Job Code:"
 msgstr ""
 
-#: rapid/rapid.py:6070
-msgid "_Resume"
+#: rapid/preferencesdialog.py:822
+msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: rapid/rapid.py:6073
-msgid "_Download All"
-msgstr "_Preuzmi sve"
+#: rapid/preferencesdialog.py:834
+msgid "Specify a path that will never be scanned for photos or videos"
+msgstr ""
 
-#. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:6082
-msgid "_Pause"
-msgstr "_Pauza"
+#: rapid/preferencesdialog.py:839
+msgid "Path:"
+msgstr ""
 
-#: rapid/rapid.py:6194
-msgid "Download device settings preferences were changed."
+#: rapid/preferencesdialog.py:1092
+msgid "Job Code"
 msgstr ""
 
-#: rapid/rapid.py:6206
-msgid "Backup preferences were changed."
+#: rapid/preferencesdialog.py:1363
+msgid "Select a folder in which to backup photos"
 msgstr ""
 
-#: rapid/rapid.py:6212
-msgid "Subfolder and filename preferences were changed."
+#: rapid/preferencesdialog.py:1376
+msgid "Select a folder in which to backup videos"
 msgstr ""
 
-#: rapid/rapid.py:6223
-msgid "Download folder preferences were changed."
+#. 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:1473
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
 msgstr ""
 
-#: rapid/rapid.py:6422
-msgid "Goodbye"
+#: rapid/preferencesdialog.py:1524
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
+"subfolders. Please use other subfolder naming options.</i>"
 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:6433
+#. 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:1527
+#, python-format
+msgid "<i>Example: %s</i>"
+msgstr "<i>Primjer: %s</i>"
+
+#. Preferences list is now empty
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
-"display program information on the command line as the program runs "
-"(default: %default)"
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
+"They will be reset to their default values."
 msgstr ""
 
-#: rapid/rapid.py:6434
-msgid "display debugging information when run from the command line"
+#: rapid/preferencesdialog.py:1762
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
 msgstr ""
 
-#: rapid/rapid.py:6435
-msgid "only output errors to the command line"
+#: rapid/preferencesdialog.py:1764
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
 msgstr ""
 
-#. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:6437
-msgid "list photo and video file extensions the program recognizes and exit"
+#: rapid/preferencesdialog.py:1765
+msgid "Invalid regular expression"
 msgstr ""
 
-#: rapid/rapid.py:6438
-msgid "reset all program settings and preferences and exit"
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1949
+msgid "externaldrive1"
 msgstr ""
 
-#: rapid/rapid.py:6452
-msgid "Photos:"
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1951
+msgid "externaldrive2"
 msgstr ""
 
-#: rapid/rapid.py:6452
-msgid "Videos:"
+#: rapid/prefsrapid.py:127
+msgid "New York"
+msgstr "New York"
+
+#: rapid/prefsrapid.py:128
+msgid "Manila"
+msgstr "Manila"
+
+#: rapid/prefsrapid.py:128
+msgid "Prague"
+msgstr "Prag"
+
+#: rapid/prefsrapid.py:128
+msgid "Helsinki"
+msgstr "Helsinki"
+
+#: rapid/prefsrapid.py:128
+msgid "Wellington"
+msgstr "Wellington"
+
+#: rapid/prefsrapid.py:129
+msgid "Tehran"
+msgstr "Teheran"
+
+#: rapid/prefsrapid.py:129
+msgid "Kampala"
+msgstr "Kampala"
+
+#: rapid/prefsrapid.py:129
+msgid "Paris"
+msgstr "Pariz"
+
+#: rapid/prefsrapid.py:129
+msgid "Berlin"
+msgstr "Berlin"
+
+#: rapid/prefsrapid.py:129
+msgid "Sydney"
+msgstr "Sydney"
+
+#: rapid/prefsrapid.py:130
+msgid "Budapest"
+msgstr "Budimpešta"
+
+#: rapid/prefsrapid.py:130
+msgid "Rome"
+msgstr "Rim"
+
+#: rapid/prefsrapid.py:130
+msgid "Moscow"
+msgstr "Moskva"
+
+#: rapid/prefsrapid.py:130
+msgid "Delhi"
+msgstr "Delhi"
+
+#: rapid/prefsrapid.py:130
+msgid "Warsaw"
+msgstr "Varšava"
+
+#: rapid/prefsrapid.py:131
+msgid "Jakarta"
+msgstr "Jakarta"
+
+#: rapid/prefsrapid.py:131
+msgid "Madrid"
+msgstr "Madrid"
+
+#: rapid/prefsrapid.py:131
+msgid "Stockholm"
+msgstr "Stockholm"
+
+#. components
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
+msgid "subfolder"
 msgstr ""
 
-#: rapid/rapid.py:6457
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
+msgid "filename"
+msgstr "ime datoteke"
+
+#: rapid/problemnotification.py:85
 #, python-format
-msgid "and %s"
+msgid "Date time value %s appears invalid."
 msgstr ""
 
-#: rapid/rapid.py:6465
-msgid "All settings and preferences have been reset"
+#: rapid/problemnotification.py:86
+msgid "Filename does not have an extension."
 msgstr ""
 
-#. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:6469 rapid/rapid.py:6470 rapid/rapid.py:6472
-#: rapid/rapid.py:6477 rapid/rapid.py:6481
-msgid "Using"
+#. a number component is something like the 8346 in IMG_8346.JPG
+#: rapid/problemnotification.py:88
+msgid "Filename does not have a number component."
 msgstr ""
 
-#: rapid/rapid.py:6474
-msgid "\n"
+#: rapid/problemnotification.py:89
+#, python-format
+msgid "Error generating component %s."
 msgstr ""
 
-#. this application is already running
-#: rapid/rapid.py:6498
+#. a generic problem
+#: rapid/problemnotification.py:91
 #, python-format
-msgid "%s is already running"
+msgid "%(filetype)s metadata cannot be read"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:192
-msgid "Date time"
+#: rapid/problemnotification.py:93
+#, python-format
+msgid "%(filetype)s %(area)s could not be generated"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:193
-msgid "Text"
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
+#, python-format
+msgid "An error occurred when copying the %(filetype)s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:195
-msgid "Metadata"
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:196
-msgid "Sequences"
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
+#, python-format
+msgid "%(filetype)s already exists"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:199
-msgid "Image date"
+#: rapid/problemnotification.py:105
+#, python-format
+msgid ""
+"%(filetype)s could not be backed up because no suitable backup locations "
+"were found."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:200
-msgid "Video date"
+#: rapid/problemnotification.py:110
+#, 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/renamesubfolderprefs.py:201
-msgid "Today"
+#: rapid/problemnotification.py:111
+#, python-format
+msgid "%(filetype)s was already downloaded"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:202
-msgid "Yesterday"
+#: rapid/problemnotification.py:115
+#, python-format
+msgid ""
+"The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+"identifier '%(identifier)s' added."
 msgstr ""
 
-#. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/renamesubfolderprefs.py:204
-msgid "Download time"
+#: rapid/problemnotification.py:116
+#, python-format
+msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:206
-msgid "Name + extension"
+#: rapid/problemnotification.py:117
+#, python-format
+msgid "There is no data with which to name the %(filetype)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:208
-msgid "Name"
+#: rapid/problemnotification.py:119
+#, python-format
+msgid "Error: %(errorno)s %(strerror)s"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:210
-msgid "Extension"
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:212
-msgid "Image number"
+#: rapid/problemnotification.py:213
+msgid "The metadata might be corrupt."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:213
-msgid "Video number"
+#: rapid/problemnotification.py:216
+msgid ""
+"The filename, extension and Exif information indicate it has already been "
+"downloaded."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:215
-msgid "Aperture"
+#: rapid/problemnotification.py:235
+#, python-format
+msgid " It was backed up to %(volume)s"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:217
-msgid "ISO"
+#: rapid/problemnotification.py:237
+msgid " It was backed up to these devices: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:219
-msgid "Exposure time"
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
+#, python-format
+msgid "%s, "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:221
-msgid "Focal length"
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
+#, python-format
+msgid "%(volumes)s and %(final_volume)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:223
-msgid "Camera make"
+#: rapid/problemnotification.py:252
+#, python-format
+msgid ""
+"Photos detected with the same filenames, but taken at different times: "
+"%(details)s"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:225
-msgid "Camera model"
+#: rapid/problemnotification.py:269
+#, python-format
+msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:227
-msgid "Short camera model"
+#: rapid/problemnotification.py:271
+#, python-format
+msgid "An error occurred when backing up on %(volume)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:229
-msgid "Hyphenated short camera model"
+#: rapid/problemnotification.py:273
+msgid "Errors occurred when backing up on the following backup devices: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:231
-msgid "Serial number"
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
+#, python-format
+msgid "%(volume)s (%(inst)s), "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:233
-msgid "Shutter count"
+#: rapid/problemnotification.py:279
+#, python-format
+msgid "%(volume)s, "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:235
-msgid "Owner name"
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
+#, python-format
+msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:236
-msgid "Codec"
+#: rapid/problemnotification.py:288
+#, python-format
+msgid "%(volumes)s and %(volume)s."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:237
-msgid "Width"
+#: rapid/problemnotification.py:296
+#, python-format
+msgid "Backup already exists on %(volume)s."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:238
-msgid "Height"
+#: rapid/problemnotification.py:298
+msgid "Backups already exist in these locations: "
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:239
-msgid "Length"
+#: rapid/problemnotification.py:308
+#, python-format
+msgid "Backup overwritten on %(volume)s."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:240
-msgid "Frames Per Second"
+#: rapid/problemnotification.py:310
+msgid "Backups overwritten on these devices: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:242
-msgid "Downloads today"
+#: rapid/problemnotification.py:321
+#, python-format
+msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:244
-msgid "Session number"
+#: rapid/problemnotification.py:323
+msgid ""
+"Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:246
-msgid "Subfolder number"
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:248
-msgid "Stored number"
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:250
-msgid "Sequence letter"
+#: rapid/problemnotification.py:347
+#, python-format
+msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:252
-msgid "All digits"
+#: rapid/problemnotification.py:355
+#, python-format
+msgid " Furthermore, there were %(problems)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:254
-msgid "Last digit"
+#: rapid/problemnotification.py:357
+#, python-format
+msgid " Furthermore, there was a %(problem)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:256
-msgid "Last 2 digits"
+#: rapid/problemnotification.py:366
+#, python-format
+msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:258
-msgid "Last 3 digits"
+#: rapid/problemnotification.py:368
+msgid "The following metadata is missing: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:260
-msgid "Last 4 digits"
+#: rapid/problemnotification.py:371
+#, python-format
+msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr ""
 
-#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:262
-msgid "Original Case"
+#: rapid/problemnotification.py:388
+msgid "Problems in subfolder and filename generation"
 msgstr ""
 
-#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:264
-msgid "UPPERCASE"
+#: rapid/problemnotification.py:390
+msgid "Problem in subfolder and filename generation"
 msgstr ""
 
-#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:266
-msgid "lowercase"
+#: rapid/problemnotification.py:393
+#, python-format
+msgid "Problems in %s generation"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:267
-msgid "One digit"
+#: rapid/problemnotification.py:395
+#, python-format
+msgid "Problem in %s generation"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:268
-msgid "Two digits"
+#: rapid/problemnotification.py:404
+#, python-format
+msgid "%(filetype)s already exists, but it was backed up"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:269
-msgid "Three digits"
+#: rapid/problemnotification.py:406
+#, python-format
+msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:270
-msgid "Four digits"
+#: rapid/problemnotification.py:428
+msgid "Multiple problems were encountered"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:271
-msgid "Five digits"
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
+msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:272
-msgid "Six digits"
+#: rapid/problemnotification.py:436
+msgid "there were errors backing up"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:273
-msgid "Seven digits"
+#: rapid/problemnotification.py:437
+msgid "There were errors backing up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
-msgid "Subseconds"
+#: rapid/problemnotification.py:439
+msgid "there was an error backing up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
-msgid "YYYYMMDD"
+#: rapid/problemnotification.py:440
+msgid "There was an error backing up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
-msgid "YYYY-MM-DD"
+#. e.g.
+#: rapid/problemnotification.py:443
+#, python-format
+msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
-msgid "YYMMDD"
+#: rapid/rpdfile.py:159
+#, python-format
+msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
-msgid "YY-MM-DD"
+#: rapid/rpdfile.py:169
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
-msgid "MMDDYYYY"
+#: rapid/subfolderfile.py:81
+#, python-format
+msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
-msgid "MMDDYY"
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
-msgid "MMDD"
+#: rapid/subfolderfile.py:406
+msgid "Photo has already been downloaded"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
-msgid "DDMMYYYY"
+#: rapid/subfolderfile.py:407
+#, python-format
+msgid "Source: %(source)s"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
-msgid "DDMMYY"
+#: rapid/subfolderfile.py:485
+msgid "Failed to create download subfolder"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:295
-msgid "YYYY"
+#: rapid/subfolderfile.py:486
+#, python-format
+msgid "Path: %s"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:297
-msgid "YY"
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:299
-msgid "MM"
+#: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:301
-msgid "DD"
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:303
-msgid "HHMMSS"
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:305
-msgid "HHMM"
-msgstr ""
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "_Doniraj..."
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:307
-msgid "HH-MM-SS"
-msgstr ""
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr "_Potraži pomoć na Internetu..."
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:309
-msgid "HH-MM"
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:311
-msgid "HH"
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:313
-msgid "MM (minutes)"
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:315
-msgid "SS"
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:800
-#, python-format
-msgid ""
-"Preference key '%(key)s' is invalid.\n"
-"Expected one of %(value)s"
-msgstr ""
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr "Prijavi _problem..."
 
-#: rapid/renamesubfolderprefs.py:807
-#, python-format
-msgid "Preference value '%(value)s' is invalid"
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:811
-msgid "These preferences are not well formed:"
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1524
-#, python-format
-msgid "Subfolder preferences should not start with a %s"
-msgstr ""
+#: rapid/glade3/rapid.ui.h:16
+msgid "_File"
+msgstr "_Datoteka"
 
-#: rapid/renamesubfolderprefs.py:1526
-#, python-format
-msgid "Subfolder preferences should not end with a %s"
-msgstr ""
+#: rapid/glade3/rapid.ui.h:17
+msgid "Download / Pause"
+msgstr "Preuzmi / Pauziraj"
 
-#: rapid/renamesubfolderprefs.py:1530
-#, python-format
-msgid "Subfolder preferences should not contain two %s one after the other"
-msgstr ""
+#: rapid/glade3/rapid.ui.h:18
+msgid "_Select"
+msgstr "_Odaberite"
 
-#: rapid/glade3/rapid.glade.h:1
-msgid " "
+#: rapid/glade3/rapid.ui.h:19
+msgid "Select All Without _Job Code"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:2
-msgid "      "
+#: rapid/glade3/rapid.ui.h:20
+msgid "Select All Wit_h Job Code"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:3
-msgid " hh:mm"
+#: rapid/glade3/rapid.ui.h:21
+msgid "_View"
+msgstr "_Pogled"
+
+#: rapid/glade3/rapid.ui.h:22
+msgid "_Error Log"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:4
-msgid ":"
+#: rapid/glade3/rapid.ui.h:23
+msgid "_Clear Completed Downloads"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:5
-msgid "<b>Backup</b>"
+#: rapid/glade3/rapid.ui.h:24
+msgid "Previous File"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:6
-msgid "<b>Compatibility with Other Operating Systems</b>"
+#: rapid/glade3/rapid.ui.h:25
+msgid "Next File"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:7
-msgid "<b>Devices</b>"
-msgstr "<b>Uređaji</b>"
+#: rapid/glade3/rapid.ui.h:26
+msgid "_Help"
+msgstr "_Pomoć"
 
-#: rapid/glade3/rapid.glade.h:8
-msgid "<b>Download Folder</b>"
-msgstr ""
+#: rapid/glade3/rapid.ui.h:27
+msgid "_Translate this Application..."
+msgstr "Prevedi _ovaj program..."
 
-#: rapid/glade3/rapid.glade.h:9
-msgid "<b>Download Subfolders</b>"
+#: rapid/glade3/rapid.ui.h:28
+msgid "_Include in download"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:10
-msgid "<b>Example</b>"
+#: rapid/glade3/rapid.ui.h:29
+msgid "_Download"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:11
-msgid "<b>Job Codes</b>"
+#: rapid/glade3/prefs.ui.h:1
+msgid "Preferences: Rapid Photo Downloader"
+msgstr "Postavke: Rapid Photo Downloader"
+
+#: rapid/glade3/prefs.ui.h:2
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:12
-msgid "<b>Photo Rename</b>"
+#: rapid/glade3/prefs.ui.h:3
+msgid "<i>Example: /home/user/Pictures</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:13
-msgid "<b>Photo and Video Name Conflicts</b>"
+#: rapid/glade3/prefs.ui.h:4
+msgid "<b>Download Subfolders</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:14
-msgid "<b>Program Automation</b>"
+#: rapid/glade3/prefs.ui.h:5
+msgid "Download folder:"
+msgstr "Direktorij preuzimanja:"
+
+#: rapid/glade3/prefs.ui.h:6
+msgid ""
+"Choose the download folder. Subfolders for the downloaded photos will be "
+"automatically created in this folder using the structure specified below."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:15
-msgid "<b>Sequence Numbers</b>"
+#: rapid/glade3/prefs.ui.h:7
+msgid "<b>Download Folder</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:16
-msgid "<i>/media/externaldrive/Photos</i>"
+#: rapid/glade3/prefs.ui.h:8
+msgid "Photo Folders"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:17
-msgid "<i>Example: /home/user/Pictures</i>"
+#: rapid/glade3/prefs.ui.h:9
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:18
-msgid "<i>Example:</i>"
+#: rapid/glade3/prefs.ui.h:10
+msgid "<b>Photo Rename</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:19
+#: rapid/glade3/prefs.ui.h:11
+msgid " "
+msgstr " "
+
+#: rapid/glade3/prefs.ui.h:12
 msgid "<i>New:</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:20
+#: rapid/glade3/prefs.ui.h:13
 msgid "<i>Original:</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:21
-msgid "<span weight=\"bold\" size=\"x-large\">Automation</span>"
+#: rapid/glade3/prefs.ui.h:14
+msgid "<b>Example</b>"
+msgstr "<b>Primjer</b>"
+
+#: rapid/glade3/prefs.ui.h:15
+msgid "Photo Rename"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:22
-msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+#: rapid/glade3/prefs.ui.h:16
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:23
-msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Uređaji</span>"
+#: rapid/glade3/prefs.ui.h:17
+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 ""
 
-#: rapid/glade3/rapid.glade.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
+#: rapid/glade3/prefs.ui.h:18
+msgid ""
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:25
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+#: rapid/glade3/prefs.ui.h:19
+msgid "Video Folders"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+#: rapid/glade3/prefs.ui.h:20
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+#: rapid/glade3/prefs.ui.h:21
+msgid "Video Rename"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:28
+#: rapid/glade3/prefs.ui.h:22
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:29
-msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+#: rapid/glade3/prefs.ui.h:23
+msgid "<b>Sequence Numbers</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:30
-msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+#: rapid/glade3/prefs.ui.h:24
+msgid ""
+"Specify the time in 24 hour format at which the <i>Downloads today</i> "
+"sequence number should be reset."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:31
-msgid "Add unique identifier"
+#: rapid/glade3/prefs.ui.h:25
+msgid "Day start:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:32
-msgid "Automatically detect Portable Storage Devices"
+#: rapid/glade3/prefs.ui.h:26
+msgid "Downloads today:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:33
-msgid "Automatically detect backup devices"
+#: rapid/glade3/prefs.ui.h:27
+msgid "Stored number:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:34
-msgid "Automatically detect devices"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:28
+msgid ":"
+msgstr ":"
 
-#: rapid/glade3/rapid.glade.h:35
-msgid "Automation"
+#: rapid/glade3/prefs.ui.h:29
+msgid " hh:mm"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:36
-msgid "Backup"
+#: rapid/glade3/prefs.ui.h:30
+msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:37
-msgid "Backup location:"
+#: rapid/glade3/prefs.ui.h:31
+msgid "<b>Compatibility with Other Operating Systems</b>"
+msgstr "<b>Kompatibilnost s ostalim operacijskim sustavima</b>"
+
+#: rapid/glade3/prefs.ui.h:32
+msgid ""
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:38
-msgid "Backup photos and videos when downloading"
+#: rapid/glade3/prefs.ui.h:33
+msgid "Strip incompatible characters"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:39
-msgid ""
-"Choose the download folder. Subfolders for the downloaded photos will be "
-"automatically created in this folder using the structure specified below."
+#: rapid/glade3/prefs.ui.h:34
+msgid "Rename Options"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:40
-msgid ""
-"Choose the download folder. Subfolders for the downloaded videos will be "
-"automatically created in this folder using the structure specified below."
+#: rapid/glade3/prefs.ui.h:35
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-10"
+#: rapid/glade3/prefs.ui.h:36
+msgid "<b>Job Codes</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:42
-msgid "Day start:"
+#: rapid/glade3/prefs.ui.h:37
+msgid "_Add..."
+msgstr "_Dodaj..."
+
+#: rapid/glade3/prefs.ui.h:39
+msgid "R_emove All"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:43
-msgid "Delete photos and videos from device upon download completion"
+#: rapid/glade3/prefs.ui.h:40
+msgid "Job Codes"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:44
+#: rapid/glade3/prefs.ui.h:41
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Uređaji</span>"
+
+#: rapid/glade3/prefs.ui.h:42
 msgid "Devices"
 msgstr "Uređaji"
 
-#: rapid/glade3/rapid.glade.h:45
+#: 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"
 "\n"
-"You can download photos from multiple devices simultaneously, or you can "
-"specify a location on your hard drive.\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\n"
 "\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Download / Pause"
-msgstr "Preuzmi / Pauziraj"
-
-#: rapid/glade3/rapid.glade.h:51
-msgid "Download folder:"
+#: rapid/glade3/prefs.ui.h:48
+msgid "Automatically detect Portable Storage Devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:52
-msgid "Downloads today:"
+#: rapid/glade3/prefs.ui.h:49
+msgid "Automatically detect devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:53
-msgid "Error Handling"
+#: rapid/glade3/prefs.ui.h:50
+msgid ""
+"If you enable automatic detection of Portable Storage Devices, the entire "
+"device will be scanned. On large devices, this could take some time.\n"
+"\n"
+"When this option is enabled, and a potential device is detected, you will be "
+"prompted to determine if it should be scanned or not."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:54
-msgid "Error Log"
+#: rapid/glade3/prefs.ui.h:53
+msgid "Location:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Exit program if download completes without any warnings or errors"
+#: rapid/glade3/prefs.ui.h:54
+msgid ""
+"If you disable automatic detection, choose the exact location of the photos "
+"and videos."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:56
-msgid "If you disable automatic detection, choose the exact backup location."
+#: rapid/glade3/prefs.ui.h:55
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:57
-msgid ""
-"If you disable automatic detection, choose the exact location of the images "
-"and videos."
+#: rapid/glade3/prefs.ui.h:56
+msgid "Remembered Paths"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:58
+#: rapid/glade3/prefs.ui.h:57
 msgid ""
-"If you enable automatic detection of Portable Storage Devices, the entire "
-"device will be scanned for images. On large devices, this could take some "
-"time."
+"Remembered paths are those associated with devices that you have chosen to "
+"always scan or ignore when automatic detection of Portable Storage Devices "
+"is enabled."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:59
-msgid "Import your photos and videos efficiently and reliably"
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:60
-msgid "Job Codes"
+#: rapid/glade3/prefs.ui.h:59
+msgid ""
+"Specify the ending portion of any paths you want ignored when scanning "
+"devices for photos or videos. Any path ending with the values below will not "
+"be scanned."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:61
-msgid "Location:"
+#: rapid/glade3/prefs.ui.h:61
+msgid "Re_move All"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:62
-msgid "Overwrite"
+#: rapid/glade3/prefs.ui.h:62
+msgid "Use _python-style regular expressions"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:63
-msgid "P_review Columns"
+#: rapid/glade3/prefs.ui.h:63
+msgid "Device Options"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:64
-msgid "Photo Folders"
+#: rapid/glade3/prefs.ui.h:64
+msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:65
-msgid "Photo Rename"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:65
+msgid "<b>Backup</b>"
+msgstr "<b>Sigurnosna kopija</b>"
 
-#: rapid/glade3/rapid.glade.h:66
-msgid "Photo backup folder name:"
+#: rapid/glade3/prefs.ui.h:66
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:67
-msgid "Preferences: Rapid Photo Downloader"
-msgstr "Postavke: Rapid Photo Downloader"
+#: rapid/glade3/prefs.ui.h:67
+msgid "Automatically detect backup devices"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:68
-msgid "Preview _Folders"
-msgstr "Pregled _mape"
+#: rapid/glade3/prefs.ui.h:68
+msgid ""
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:70
-msgid "R_emove All"
+#: rapid/glade3/prefs.ui.h:69
+msgid "Back up photos and videos when downloading"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:72
+#: rapid/glade3/prefs.ui.h:70
 msgid ""
-"Rapid Photo Downloader is free software; you can redistribute it and/or "
-"modify it under the terms of the GNU General Public License as published by "
-"the Free Software Foundation; either version 2 of the License, or (at your "
-"option) any later version.\n"
-"\n"
-"Rapid Photo Downloader is distributed in the hope that it will be useful, "
-"but WITHOUT ANY WARRANTY; without even the implied warranty of "
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
-"Public License for more details.\n"
+"Specify the folder in which backups are stored on the device.  \n"
 "\n"
-"You should have received a copy of the GNU General Public License along with "
-"Rapid Photo Downloader; if not, write to the Free Software Foundation, Inc., "
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"<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 ""
 
-#: rapid/glade3/rapid.glade.h:77
-msgid "Rename Options"
+#: rapid/glade3/prefs.ui.h:73
+msgid "Photo backup location:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:78
-msgid "Se_lect None"
+#: rapid/glade3/prefs.ui.h:74
+msgid "Photo backup folder name:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:79
-msgid "Select All Pho_tos"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:75
+msgid "<i>Example:</i>"
+msgstr "<i>Primjer:</i>"
 
-#: rapid/glade3/rapid.glade.h:80
-msgid "Select All Vi_deos"
+#: rapid/glade3/prefs.ui.h:76
+msgid "<i>/media/externaldrive/Photos</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:81
-msgid "Select All Wit_h Job Code"
+#: rapid/glade3/prefs.ui.h:77
+msgid "Video backup folder name:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:82
-msgid "Select All Without _Job Code"
+#: rapid/glade3/prefs.ui.h:78
+msgid "Video backup location:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:83
-msgid "Select _All"
-msgstr "Odaberite _sve"
-
-#: rapid/glade3/rapid.glade.h:84
-msgid "Skip"
+#: rapid/glade3/prefs.ui.h:79
+msgid "Back up"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:85
-msgid "Skip download"
+#: rapid/glade3/prefs.ui.h:80
+msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:86
-msgid ""
-"Sorry, video downloading functionality disabled. To download videos, please "
-"install the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for "
-"python."
+#: rapid/glade3/prefs.ui.h:81
+msgid "<b>Program Automation</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:87
-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>"
+#: rapid/glade3/prefs.ui.h:82
+msgid "Unmount (\"eject\") device upon download completion"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:90
-msgid ""
-"Specify the time in 24 hour format at which the <i>Downloads today</i> "
-"sequence number should be reset."
+#: rapid/glade3/prefs.ui.h:83
+msgid "Start downloading at program startup"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:91
-msgid ""
-"Specify whether photo, video and folder names should have any characters "
-"removed that are not allowed by other operating systems."
+#: rapid/glade3/prefs.ui.h:84
+msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:92
-msgid "Start downloading at program startup"
+#: rapid/glade3/prefs.ui.h:85
+msgid "Exit program when download completes"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:93
-msgid "Start downloading upon device insertion"
+#: rapid/glade3/prefs.ui.h:86
+msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:94
-msgid "Stored number:"
+#: rapid/glade3/prefs.ui.h:87
+msgid "Automatically rotate JPEG images"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:95
-msgid "Strip incompatible characters"
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:96
-msgid "Synchronize RAW + JPEG sequence numbers"
+#: rapid/glade3/prefs.ui.h:90
+msgid "Performance"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:97
-msgid "Unmount (\"eject\") device upon download completion"
+#: rapid/glade3/prefs.ui.h:91
+msgid "Generate thumbnails (slower)"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:98
-msgid "Video Folders"
+#: rapid/glade3/prefs.ui.h:92
+msgid "Miscellaneous"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:99
-msgid "Video Rename"
+#: rapid/glade3/prefs.ui.h:93
+msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:100
-msgid "Video backup folder name:"
+#: rapid/glade3/prefs.ui.h:94
+msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/prefs.ui.h:95
+msgid "Add unique identifier"
+msgstr "Dodaj jedinstveni identifikator"
+
+#: rapid/glade3/prefs.ui.h:96
+msgid "Skip download"
+msgstr "Preskoči preuzimanje"
+
+#: rapid/glade3/prefs.ui.h:97
 msgid ""
 "When a photo or video of the same name has already been downloaded, choose "
 "whether to skip downloading the file, or to add a unique indentifier."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:103
-msgid ""
-"You can have your photos and videos backed up to multiple locations as they "
-"are downloaded, e.g. external hard drives."
+#: rapid/glade3/prefs.ui.h:99
+msgid "Overwrite"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:104
-msgid "_Add..."
+#: rapid/glade3/prefs.ui.h:100
+msgid "Skip"
+msgstr "Preskoči"
+
+#: rapid/glade3/prefs.ui.h:101
+msgid "Error Handling"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:105
-msgid "_Clear Completed Downloads"
+#: rapid/glade3/about.ui.h:1
+msgid "Import your photos and videos efficiently and reliably"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:106
-msgid "_Device"
-msgstr "_Uređaj"
+#~ msgid "errors"
+#~ msgstr "greške"
 
-#: rapid/glade3/rapid.glade.h:107
-msgid "_Error Log"
-msgstr ""
+#~ msgid "Report an error"
+#~ msgstr "Prijavi pogrešku"
 
-#: rapid/glade3/rapid.glade.h:108
-msgid "_File"
-msgstr "_Datoteka"
+#~ msgid "_Pause"
+#~ msgstr "_Pauza"
+
+#~ msgid "Sorry,these preferences contain an error:\n"
+#~ msgstr "Žao mi je, ove opcije sadrže grešku:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Please check preferences, restart the program, and try again."
+#~ msgstr ""
+#~ "\n"
+#~ "Molim provjerite postavke, ponovno pokrenite program i pokušajte ponovo."
 
-#: rapid/glade3/rapid.glade.h:109
-msgid "_Filename"
-msgstr "_Ime datoteke"
+#~ msgid "Could not open image"
+#~ msgstr "Ne mogu otvoriti sliku"
 
-#: rapid/glade3/rapid.glade.h:110
-msgid "_Get Help Online..."
-msgstr "_Potraži pomoć na Internetu..."
+#, python-format
+#~ msgid "Source: %s"
+#~ msgstr "Izvor: %s"
 
-#: rapid/glade3/rapid.glade.h:111
-msgid "_Help"
-msgstr "_Pomoć"
+#, python-format
+#~ msgid ""
+#~ "Source: %(source)s\n"
+#~ "Destination: %(destination)s\n"
+#~ "Problem: %(problem)s"
+#~ msgstr ""
+#~ "Izvor: %(source)s\n"
+#~ "Odredište: %(destination)s\n"
+#~ "Problem: %(problem)s"
 
-#: rapid/glade3/rapid.glade.h:112
-msgid "_Make a Donation..."
-msgstr "_Doniraj..."
+#, python-format
+#~ msgid ""
+#~ "Source: %(source)s\n"
+#~ "Problem: %(problem)s"
+#~ msgstr ""
+#~ "Izvor: %(source)s\n"
+#~ "Problem: %(problem)s"
 
-#: rapid/glade3/rapid.glade.h:113
-msgid "_Path"
-msgstr ""
+#, python-format
+#~ msgid ""
+#~ "Source: %(source)s\n"
+#~ "Destination: %(destination)s\n"
+#~ "Error: %(errorno)s %(strerror)s"
+#~ msgstr ""
+#~ "Izvor: %(source)s\n"
+#~ "Odredište: %(destination)s\n"
+#~ "Greška: %(errorno)s %(strerror)s"
 
-#: rapid/glade3/rapid.glade.h:114
-msgid "_Preview"
-msgstr "_Pretpregled"
+#~ msgid "The image was not copied."
+#~ msgstr "Slika nije kopirana."
 
-#: rapid/glade3/rapid.glade.h:115
-msgid "_Report a Problem..."
-msgstr "Prijavi _problem..."
+#, python-format
+#~ msgid ""
+#~ "Subfolder: %(subfolder)s\n"
+#~ "Image: %(image)s\n"
+#~ "Problem: %(problem)s"
+#~ msgstr ""
+#~ "Poddirektorij: %(subfolder)s\n"
+#~ "Slika: %(image)s\n"
+#~ "Problem: %(problem)s"
 
-#: rapid/glade3/rapid.glade.h:116
-msgid "_Select"
-msgstr "_Odaberite"
+#, python-format
+#~ msgid ""
+#~ "Source: %(source)s\n"
+#~ "Destination: %(destination)s\n"
+#~ "Error: %(errno)s %(strerror)s"
+#~ msgstr ""
+#~ "Izvor: %(source)s\n"
+#~ "Odredište: %(destination)s\n"
+#~ "Greška: %(errno)s %(strerror)s"
 
-#: rapid/glade3/rapid.glade.h:117
-msgid "_Size"
-msgstr "_Veličina"
+#, python-format
+#~ msgid ""
+#~ "Destination directory could not be created\n"
+#~ "%(directory)s\n"
+#~ "Error: %(errno)s %(strerror)s"
+#~ msgstr ""
+#~ "Ne može se stvoriti odredišni direktorij\n"
+#~ "%(directory)s\n"
+#~ "Greška: %(errno)s %(strerror)s"
 
-#: rapid/glade3/rapid.glade.h:118
-msgid "_Translate this Application..."
-msgstr "Prevedi _ovaj program..."
+#~ msgid ""
+#~ "A newer version of this program was previously run on this computer.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Novija verzija ovog programa je prethodno pokrenuta na ovom računalu.\n"
+#~ "\n"
 
-#: rapid/glade3/rapid.glade.h:119
-msgid "_Type"
-msgstr "_Tip"
+#~ msgid "Warning:"
+#~ msgstr "Upozorenje:"
 
-#: rapid/glade3/rapid.glade.h:120
-msgid "_View"
-msgstr "_Pogled"
+#~ msgid "No preferences needed to be changed."
+#~ msgstr "Mijenjanje postavki nije potrebno."
 
-#~ msgid "Preview"
-#~ msgstr "Pretpregled"
+#~ msgid ""
+#~ "This version of the program is newer than the previously run version. "
+#~ "Checking preferences."
+#~ msgstr ""
+#~ "Ova verzija programa je novija od prethodno pokrenute verzije. Provjeravam "
+#~ "postavke."
 
-#~ msgid "Report an error"
-#~ msgstr "Prijavi pogrešku"
+#~ msgid "Using manually specified path"
+#~ msgstr "Koristim ručno zadanu putanju"
+
+#~ msgid "Preferences were changed."
+#~ msgstr "Postavke su promijenjene."
+
+#, python-format
+#~ msgid "%s is already running"
+#~ msgstr "Program %s je već pokrenut"
+
+#~ msgid "      "
+#~ msgstr "      "
+
+#~ msgid "Backup photos when downloading"
+#~ msgstr "Napravi sigurnosnu kopiju fotografija prilikom preuzimanja"
+
+#~ msgid "Copyright Damon Lynch 2007-09"
+#~ msgstr "Copyright Damon Lynch 2007-09"
+
+#~ msgid "Automation"
+#~ msgstr "Automatizacija"
+
+#~ msgid "Backup"
+#~ msgstr "Sigurnosna kopija"
+
+#~ msgid "Download Folder"
+#~ msgstr "Direktorij preuzimanja"
+
+#~ msgid "Exit program after completion of successful download"
+#~ msgstr "Zatvori program nakon uspješnog preuzimanja"
+
+#~ msgid "_Photos"
+#~ msgstr "_Fotografije"
+
+#~ msgid "_Thumbnails"
+#~ msgstr "_Umanjene sličice"
+
+#~ msgid "Select a folder in which to backup images"
+#~ msgstr "Odaberite direktorij za spremanje sigurnosnih kopija slika"
+
+#~ msgid "Image already exists"
+#~ msgstr "Slika već postoji"
diff --git a/po/hu.po b/po/hu.po
index b10f366..782b319 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-11-20 13:25-0600\n"
-"PO-Revision-Date: 2011-12-06 12:12+0000\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:12+0000\n"
 "Last-Translator: loriand <level.andrasnak@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-28 07:56+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\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:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Gyors Fotó Letöltő"
 
-#: rapid/rapid.py:112
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:114
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:127
 #, 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:162
 msgid "Device"
 msgstr "Eszköz"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:170
+#: rapid/rapid.py:180
 msgid "Size"
 msgstr "Méret"
 
-#: rapid/rapid.py:173
+#: rapid/rapid.py:183
 msgid "Download Progress"
 msgstr "Letöltés Folyamatban"
 
-#: rapid/rapid.py:319
+#: rapid/rapid.py:343
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s eszköz nem lett csatlakoztatva"
@@ -66,36 +66,36 @@ msgstr "%(device)s eszköz nem lett csatlakoztatva"
 #. looking for photos or videos. It is visible initially in the progress bar for each device
 #. (which normally holds "x photos and videos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1186
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr "keresés..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1697
+#: rapid/rapid.py:1818
 msgid "the root of the file system"
 msgstr "a fájlrendszer gyökere"
 
 #. 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:1822
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Letöltés  innen: %(location)s."
 
-#: rapid/rapid.py:1702
+#: rapid/rapid.py:1823
 msgid ""
 "Do you really want to download from here? On some systems, scanning this "
 "location can take a very long time."
 msgstr "Valóban le akarsz tölteni innen? Néhány rendszeren ez sokáig tart."
 
-#: rapid/rapid.py:2124 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr "Letöltés"
 
-#: rapid/rapid.py:2127
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr "Megállítás"
 
-#: rapid/rapid.py:2228
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -106,7 +106,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2231
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -115,94 +115,107 @@ msgstr ""
 "Nem jó a letöltési könyvtár:\n"
 "%s"
 
-#: rapid/rapid.py:2232
+#: rapid/rapid.py:2380
 msgid "Download cannot proceed"
 msgstr "A letöltés megszakadt."
 
-#: rapid/rapid.py:2559
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+"A biztonsági másolat eszköze nem tartalmaz megfelelő könyvtárat a "
+"%(filetype)  számára."
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "fényképek"
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "videók"
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr "Probléma a Biztonsági mentéssel"
+
+#: rapid/rapid.py:2802
 msgid "About 1 second remaining"
 msgstr "Kb. 1 másodperc van hátra"
 
-#: rapid/rapid.py:2561
+#: rapid/rapid.py:2804
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Kb. %i másodperc van hátra"
 
-#: rapid/rapid.py:2563
+#: rapid/rapid.py:2806
 msgid "About 1 minute remaining"
 msgstr "Kb. 1 perc van hátra"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:2568
+#: rapid/rapid.py:2811
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Kb. %(minutes)i:%(seconds)02i perc van hátra"
 
-#: rapid/rapid.py:2590 rapid/rpdfile.py:113
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
 msgid "photos and videos"
 msgstr "fényképek és videók"
 
-#: rapid/rapid.py:2592 rapid/rpdfile.py:115
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
 msgid "photos or videos"
 msgstr "fénykép vagy videó"
 
-#: rapid/rapid.py:2595 rapid/rapid.py:3408 rapid/rpdfile.py:118
-msgid "videos"
-msgstr "videók"
-
-#: rapid/rapid.py:2597 rapid/preferencesdialog.py:1617 rapid/rpdfile.py:120
-#: rapid/rpdfile.py:254
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
 msgid "video"
 msgstr "videó"
 
-#: rapid/rapid.py:2600 rapid/rapid.py:3406 rapid/rpdfile.py:123
-msgid "photos"
-msgstr "fényképek"
-
 #. 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:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
 msgid "photo"
 msgstr "fénykép"
 
-#: rapid/rapid.py:2629
+#: rapid/rapid.py:2872
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "Letöltve: %(noFiles)s %(filetypes)s"
 
-#: rapid/rapid.py:2633
+#: rapid/rapid.py:2876
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s : sikertelen letöltés"
 
-#: rapid/rapid.py:2636 rapid/rapid.py:2688
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
 msgid "warnings"
 msgstr "figyelmeztetések"
 
-#: rapid/rapid.py:2645
+#: rapid/rapid.py:2892
 msgid "All downloads complete"
 msgstr "Minden letöltés befejeződött"
 
-#: rapid/rapid.py:2651 rapid/rapid.py:2660 rapid/rapid.py:2669
-#: rapid/rapid.py:2678 rapid/rapid.py:2686
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2653 rapid/rapid.py:2671
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s letöltve"
 
-#: rapid/rapid.py:2662 rapid/rapid.py:2680
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s letöltése sikertelen volt"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2719
+#: rapid/rapid.py:2970
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr ""
@@ -210,83 +223,83 @@ msgstr ""
 "hátra van)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2726
+#: rapid/rapid.py:2977
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(total)s %(filetypes)s összesen.  Letöltve: %(number)s"
 
-#: rapid/rapid.py:3072
+#: rapid/rapid.py:3331
 msgid "From"
 msgstr "Honnan"
 
-#: rapid/rapid.py:3080
+#: rapid/rapid.py:3339
 msgid "Auto Detect"
 msgstr "Automatikus Felismerés"
 
-#: rapid/rapid.py:3084 rapid/preferencesdialog.py:1324
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Válasszon egy könyvtárt az alábbiaknak: %(file_types)s"
 
-#: rapid/rapid.py:3125
+#: rapid/rapid.py:3384
 msgid "Copy"
 msgstr "Másolás"
 
-#: rapid/rapid.py:3138
+#: rapid/rapid.py:3397
 msgid "Move"
 msgstr "Áthelyezés"
 
-#: rapid/rapid.py:3160
+#: rapid/rapid.py:3419
 msgid "To"
 msgstr "Hova"
 
-#: rapid/rapid.py:3167 rapid/rapid.py:3796
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
 msgid "Photos:"
 msgstr "Fényképek:"
 
-#: rapid/rapid.py:3170 rapid/preferencesdialog.py:1161
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
 msgid "Select a folder to download photos to"
 msgstr "Válasszon egy letöltési könyvtárat"
 
-#: rapid/rapid.py:3182 rapid/rapid.py:3796
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
 msgid "Videos:"
 msgstr "Videók:"
 
-#: rapid/rapid.py:3184 rapid/preferencesdialog.py:1179
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
 msgid "Select a folder to download videos to"
 msgstr "Válasszon egy letöltési könyvtárat"
 
-#: rapid/rapid.py:3376
+#: rapid/rapid.py:3650
 msgid "and"
 msgstr "és"
 
-#: rapid/rapid.py:3381
+#: rapid/rapid.py:3655
 msgid "Using backup devices"
 msgstr "A biztonsági mentés eszközök használata"
 
-#: rapid/rapid.py:3383
+#: rapid/rapid.py:3657
 msgid "Using backup device"
 msgstr "A biztonsági mentés eszköz használata"
 
-#: rapid/rapid.py:3385
+#: rapid/rapid.py:3659
 msgid "No backup devices detected"
 msgstr "Nincs elérhető biztonsági mentés eszköz"
 
-#: rapid/rapid.py:3412
+#: rapid/rapid.py:3686
 msgid "Free space:"
 msgstr "Szabad hely:"
 
 #. (videos) or (photos) will be appended to the free space message displayed to the
 #. user in the status bar.
 #. you should only translate this if your language does not use parantheses
-#: rapid/rapid.py:3424
+#: rapid/rapid.py:3698
 #, 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:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -294,89 +307,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:3433
+#: rapid/rapid.py:3707
 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:3712
 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:3718
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s üres"
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3452
+#: rapid/rapid.py:3726
 #, python-format
 msgid "Backing up photos and videos to %(path)s"
 msgstr "Fotók és videók biztonsági mentésének helye: %(path)s"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3455
+#: rapid/rapid.py:3729
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Biztonsági mentés készül az alábbi helyre: %(path)s"
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3458
+#: rapid/rapid.py:3732
 #, python-format
 msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr ""
 "A fotók biztonsági mentése a %(path)s könyvtárba és a videók biztonsági "
 "mentése a %(path2)s könyvtárba"
 
-#: rapid/rapid.py:3465
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3494
+#: rapid/rapid.py:3768
 msgid "Program preferences are invalid"
 msgstr "A program beállítása nem jó."
 
-#: rapid/rapid.py:3613 rapid/rpdfile.py:235
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
 msgid "Photo"
 msgstr "Fénykép"
 
-#: rapid/rapid.py:3615 rapid/rpdfile.py:255
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "Videó"
 
-#: rapid/rapid.py:3624
+#: rapid/rapid.py:3921
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s letöltési könyvtár nem létezik"
 
-#: rapid/rapid.py:3626 rapid/rapid.py:3640 rapid/rapid.py:3653
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
 msgid "Folder: %s"
 msgstr "könyvtár: %s"
 
-#: rapid/rapid.py:3638
+#: rapid/rapid.py:3935
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s letöltési könyvtár nem jó"
 
-#: rapid/rapid.py:3651
+#: rapid/rapid.py:3948
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s letöltési könyvtár nem írható"
 
-#: rapid/rapid.py:3729
+#: rapid/rapid.py:4034
 msgid "Thumbnails"
 msgstr "Előnézeti képek"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3777
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -385,44 +398,63 @@ msgstr ""
 "futás közben program információ megjelenítése a terminálban (default: "
 "%default)"
 
-#: rapid/rapid.py:3778
+#: rapid/rapid.py:4090
 msgid "display debugging information when run from the command line"
 msgstr "Mutassa a hibakeresési információkat parancssoros futtatásnál."
 
-#: rapid/rapid.py:3779
+#: rapid/rapid.py:4091
 msgid "only output errors to the command line"
 msgstr "csak a hibák megjelenítése a terminálban"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3781
+#: rapid/rapid.py:4093
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 "A program által felismerhető kép és videó kiterjesztések listázása, majd "
 "kilépés"
 
-#: rapid/rapid.py:3783
+#: rapid/rapid.py:4095
+msgid ""
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
+msgstr ""
+
+#: rapid/rapid.py:4096
+msgid ""
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
+msgstr ""
+
+#: rapid/rapid.py:4097
 msgid "reset all program settings and preferences and exit"
 msgstr "A program beállításainak visszaállítása, majd kilépés"
 
-#: rapid/rapid.py:3801
+#: rapid/rapid.py:4110
+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:4133
 #, python-format
 msgid "and %s"
 msgstr "és %s"
 
-#: rapid/rapid.py:3809
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
 msgstr "Minden beállítás visszaállításra került"
 
-#: rapid/backupfile.py:142 rapid/backupfile.py:165
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
 msgid "Backing up error"
 msgstr "A biztonsági másolat készítése során hiba történt."
 
-#: rapid/backupfile.py:144
+#: rapid/backupfile.py:151
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "A cél könyvtár nem hozható létre: %(directory)s\n"
 
-#: rapid/backupfile.py:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -431,13 +463,29 @@ msgstr ""
 "Forrás: %(source)s\n"
 "Cél: %(destination)s"
 
-#: rapid/backupfile.py:149 rapid/backupfile.py:169
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Hiba: %(inst)s"
 
-#: rapid/copyfiles.py:159 rapid/subfolderfile.py:211
-#: rapid/subfolderfile.py:352 rapid/subfolderfile.py:370
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -446,12 +494,16 @@ msgstr ""
 "%(problem)s\n"
 "Fájl: %(file)s"
 
-#: rapid/device.py:79
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr "Ismeretlen hiba történt"
+
+#: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Eszköz érzékelve"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/device.py:88
+#: rapid/device.py:89
 msgid ""
 "Should this device or partition be used to download photos or videos from?"
 msgstr ""
@@ -459,483 +511,493 @@ msgstr ""
 "használni?"
 
 #. 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 "_Emlékezzen erre a választásra"
 
-#: 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 "Dátum és idő"
 
-#: rapid/generatenameconfig.py:151
+#: rapid/generatenameconfig.py:152
 msgid "Text"
 msgstr "Szöveg"
 
-#: rapid/generatenameconfig.py:152
+#: rapid/generatenameconfig.py:153
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: rapid/generatenameconfig.py:153
+#: rapid/generatenameconfig.py:154
 msgid "Metadata"
 msgstr "Metaadat"
 
-#: rapid/generatenameconfig.py:154
+#: rapid/generatenameconfig.py:155
 msgid "Sequences"
 msgstr "Sorozatok"
 
 #. 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 "Munka-szám"
 
-#: rapid/generatenameconfig.py:157
+#: rapid/generatenameconfig.py:158
 msgid "Image date"
 msgstr "Kép dátuma"
 
-#: rapid/generatenameconfig.py:158
+#: rapid/generatenameconfig.py:159
 msgid "Video date"
 msgstr "Videó dátum"
 
-#: rapid/generatenameconfig.py:159
+#: rapid/generatenameconfig.py:160
 msgid "Today"
 msgstr "Ma"
 
-#: rapid/generatenameconfig.py:160
+#: rapid/generatenameconfig.py:161
 msgid "Yesterday"
 msgstr "Tegnap"
 
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/generatenameconfig.py:162
+#: rapid/generatenameconfig.py:163
 msgid "Download time"
 msgstr "Letöltési idő"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:164
+#: rapid/generatenameconfig.py:165
 msgid "Name + extension"
 msgstr "Név + kiterjesztés"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:166
+#: rapid/generatenameconfig.py:167
 msgid "Name"
 msgstr "Név"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:168
+#: rapid/generatenameconfig.py:169
 msgid "Extension"
 msgstr "Kiterjesztés"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:170
+#: rapid/generatenameconfig.py:171
 msgid "Image number"
 msgstr "Kép száma"
 
-#: rapid/generatenameconfig.py:171
+#: rapid/generatenameconfig.py:172
 msgid "Video number"
 msgstr "Videó sorszám"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:173
+#: rapid/generatenameconfig.py:174
 msgid "Aperture"
 msgstr "Rekesz"
 
 #. 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 "Expozíciós idő"
 
 #. 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 "Fókusztávolság"
 
 #. 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 "Fényképezőgép gyártója"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:183
+#: rapid/generatenameconfig.py:184
 msgid "Camera model"
 msgstr "Fényképezőgép"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:185
+#: rapid/generatenameconfig.py:186
 msgid "Short camera model"
 msgstr "Rövid típusmegnevezés"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:187
+#: rapid/generatenameconfig.py:188
 msgid "Hyphenated short camera model"
 msgstr "Bővített típusmegnevezés"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:189
+#: rapid/generatenameconfig.py:190
 msgid "Serial number"
 msgstr "Sorozatszám"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:191
+#: rapid/generatenameconfig.py:192
 msgid "Shutter count"
 msgstr "Zár számláló"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: rapid/generatenameconfig.py:193
+#: rapid/generatenameconfig.py:194
 msgid "File number"
 msgstr "Fájl (sor)szám"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: rapid/generatenameconfig.py:195
+#: rapid/generatenameconfig.py:196
 msgid "Folder only"
 msgstr "Csak mappa"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: rapid/generatenameconfig.py:197
+#: rapid/generatenameconfig.py:198
 msgid "Folder and file"
 msgstr "Mappa és fájl"
 
 #. 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 "A tulajdonos neve"
 
-#: rapid/generatenameconfig.py:200
+#: rapid/generatenameconfig.py:201
 msgid "Codec"
 msgstr "Kodek"
 
-#: rapid/generatenameconfig.py:201
+#: rapid/generatenameconfig.py:202
 msgid "Width"
 msgstr "Szélesség"
 
-#: rapid/generatenameconfig.py:202
+#: rapid/generatenameconfig.py:203
 msgid "Height"
 msgstr "Magasság"
 
-#: rapid/generatenameconfig.py:203
+#: rapid/generatenameconfig.py:204
 msgid "Length"
 msgstr "Hossz"
 
-#: rapid/generatenameconfig.py:204
+#: rapid/generatenameconfig.py:205
 msgid "Frames Per Second"
 msgstr "Képkoca/másodperc"
 
-#: rapid/generatenameconfig.py:205
+#: rapid/generatenameconfig.py:206
 msgid "Artist"
 msgstr "Készítette"
 
-#: rapid/generatenameconfig.py:206
+#: rapid/generatenameconfig.py:207
 msgid "Copyright"
 msgstr "Szerzői jog"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:208
+#: rapid/generatenameconfig.py:209
 msgid "Downloads today"
 msgstr "Mai letöltések"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:210
+#: rapid/generatenameconfig.py:211
 msgid "Session number"
 msgstr "Munkamenetszám"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:212
+#: rapid/generatenameconfig.py:213
 msgid "Subfolder number"
 msgstr "Alkönyvtár száma"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:214
+#: rapid/generatenameconfig.py:215
 msgid "Stored number"
 msgstr "Tárolt szám"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/generatenameconfig.py:216
+#: rapid/generatenameconfig.py:217
 msgid "Sequence letter"
 msgstr "Sorozat betű"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:218
+#: rapid/generatenameconfig.py:219
 msgid "All digits"
 msgstr "Minden számjegy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:220
+#: rapid/generatenameconfig.py:221
 msgid "Last digit"
 msgstr "Utolsó számjegy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:222
+#: rapid/generatenameconfig.py:223
 msgid "Last 2 digits"
 msgstr "Utolsó 2 számjegy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:224
+#: rapid/generatenameconfig.py:225
 msgid "Last 3 digits"
 msgstr "Utolsó 3 számjegy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:226
+#: rapid/generatenameconfig.py:227
 msgid "Last 4 digits"
 msgstr "Utolsó 4 számjegy"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:228
+#: rapid/generatenameconfig.py:229
 msgid "Original Case"
 msgstr "Eredeti kisbetű / nagybetű"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:230
+#: rapid/generatenameconfig.py:231
 msgid "UPPERCASE"
 msgstr "NAGYBETŰS"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:232
+#: rapid/generatenameconfig.py:233
 msgid "lowercase"
 msgstr "kisbetűs"
 
-#: rapid/generatenameconfig.py:233
+#: rapid/generatenameconfig.py:234
 msgid "One digit"
 msgstr "Egyszámjegyű"
 
-#: rapid/generatenameconfig.py:234
+#: rapid/generatenameconfig.py:235
 msgid "Two digits"
 msgstr "Kétszámjegyű"
 
-#: rapid/generatenameconfig.py:235
+#: rapid/generatenameconfig.py:236
 msgid "Three digits"
 msgstr "Háromszámjegyű"
 
-#: rapid/generatenameconfig.py:236
+#: rapid/generatenameconfig.py:237
 msgid "Four digits"
 msgstr "Négyszámjegyű"
 
-#: rapid/generatenameconfig.py:237
+#: rapid/generatenameconfig.py:238
 msgid "Five digits"
 msgstr "Ötszámjegyű"
 
-#: rapid/generatenameconfig.py:238
+#: rapid/generatenameconfig.py:239
 msgid "Six digits"
 msgstr "Hatszámjegyű"
 
-#: rapid/generatenameconfig.py:239
+#: rapid/generatenameconfig.py:240
 msgid "Seven digits"
 msgstr "Hét számjegy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:241
+#: rapid/generatenameconfig.py:242
 msgid "Subseconds"
 msgstr "Millimásodperc"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:243
+#: rapid/generatenameconfig.py:244
 msgid "YYYYMMDD"
 msgstr "ÉÉÉÉHHNN"
 
 #. 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 "ÉÉÉÉ-HH-NN"
 
 #. 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 "ÉÉHHNN"
 
 #. 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 "ÉÉ-HH-NN"
 
 #. 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 "HHNNÉÉÉÉ"
 
 #. 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 "HHNNÉÉ"
 
 #. 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 "HHNN"
 
 #. 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 "NNHHÉÉÉÉ"
 
 #. 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 "NNHHÉÉ"
 
 #. 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 "HH"
 
 #. 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 "NN"
 
 #. 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 "Hónap (teljes)"
+
+#. 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 "Hónap (rövid)"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:274
 msgid "HHMMSS"
 msgstr "ÓÓPPMM"
 
 #. 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 "ÓÓPP"
 
 #. 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 "ÓÓ-PP-MM"
 
 #. 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 "ÓÓ-PP"
 
 #. 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 "PP"
 
 #. 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 "MM"
 
-#: rapid/preferencesdialog.py:371
+#: rapid/preferencesdialog.py:374
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Alkönyvtár beállítások nem kezdődhetnek %s értékkel"
 
-#: rapid/preferencesdialog.py:373
+#: rapid/preferencesdialog.py:376
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Alkönyvtár beállítások nem végződhetnek %s értékkel"
 
-#: rapid/preferencesdialog.py:377
+#: rapid/preferencesdialog.py:380
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 "Alkönyvtár beállítások nem tartalmazhatnak két %s értéket egymás után"
 
-#: rapid/preferencesdialog.py:436 rapid/preferencesdialog.py:697
+#: rapid/preferencesdialog.py:439 rapid/preferencesdialog.py:700
 msgid "Remove all Job Codes?"
 msgstr "Minden Munka-szám eltávolítása?"
 
-#: rapid/preferencesdialog.py:437 rapid/preferencesdialog.py:714
+#: rapid/preferencesdialog.py:440 rapid/preferencesdialog.py:717
 msgid "Should all Job Codes be removed?"
 msgstr "Minden Munka-szám el legyen távolítva?"
 
-#: rapid/preferencesdialog.py:443
+#: rapid/preferencesdialog.py:446
 msgid "Remove all Remembered Paths?"
 msgstr "Minden megjegyzett elérési út eltávolítása?"
 
-#: rapid/preferencesdialog.py:444
+#: rapid/preferencesdialog.py:447
 msgid "Should all remembered paths be removed?"
 msgstr "Biztosan eltávolítod az összes megjegyzett elérési utat?"
 
-#: rapid/preferencesdialog.py:450
+#: rapid/preferencesdialog.py:453
 msgid "Remove all Ignored Paths?"
 msgstr "Minden mellőzött útvonal törlése"
 
-#: rapid/preferencesdialog.py:451
+#: rapid/preferencesdialog.py:454
 msgid "Should all ignored paths be removed?"
 msgstr "Valóban törölni szeretnéd az összes mellőzött útvonalat?"
 
-#: rapid/preferencesdialog.py:462
+#: rapid/preferencesdialog.py:465
 msgid "Error in Photo Rename preferences"
 msgstr "Hiba a fénykép átnevezési beállításoknál"
 
-#: rapid/preferencesdialog.py:642
+#: rapid/preferencesdialog.py:645
 msgid "Error in Video Rename preferences"
 msgstr "Hiba a videó átnevezési beállításoknál"
 
-#: rapid/preferencesdialog.py:663
+#: rapid/preferencesdialog.py:666
 msgid "Error in Photo Download Subfolders preferences"
 msgstr "Hiba a fénykép letöltési alkönyvtár beállításoknál"
 
-#: rapid/preferencesdialog.py:680
+#: rapid/preferencesdialog.py:683
 msgid "Error in Video Download Subfolders preferences"
 msgstr "Hiba a videó letöltési alkönyvtár beállításoknál"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:739
+#: rapid/preferencesdialog.py:742
 msgid "Enter a Job Code"
 msgstr "Adjon meg munka-számot"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:755
+#: rapid/preferencesdialog.py:758
 msgid "Enter a new Job Code, or select a previous one"
 msgstr "Adjon meg új munka-kódot, vagy válasszon egyet a korábbiakból."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:758
+#: rapid/preferencesdialog.py:761
 msgid "Enter a new Job Code"
 msgstr "Adjon meg új munka-kódot"
 
-#: rapid/preferencesdialog.py:763
+#: rapid/preferencesdialog.py:766
 msgid "Job Code:"
 msgstr "Munka-szám:"
 
-#: rapid/preferencesdialog.py:819
+#: rapid/preferencesdialog.py:822
 msgid "Enter a Path to Ignore"
 msgstr "Add meg a mellőzni kívánt útvonalat"
 
-#: rapid/preferencesdialog.py:831
+#: rapid/preferencesdialog.py:834
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 "Kérlek add meg azt a könyvtárt ahol soha ne keressek fényképeket vagy "
 "videókat"
 
-#: rapid/preferencesdialog.py:836
+#: rapid/preferencesdialog.py:839
 msgid "Path:"
 msgstr "Útvonal:"
 
-#: rapid/preferencesdialog.py:1079
+#: rapid/preferencesdialog.py:1092
 msgid "Job Code"
 msgstr "Munka kód"
 
-#: rapid/preferencesdialog.py:1350
+#: rapid/preferencesdialog.py:1363
 msgid "Select a folder in which to backup photos"
 msgstr "Add meg a fényképek biztonsági mentésének útvonalát"
 
-#: rapid/preferencesdialog.py:1363
+#: rapid/preferencesdialog.py:1376
 msgid "Select a folder in which to backup videos"
 msgstr "Add meg a videók biztonsági mentésének útvonalát"
 
 #. 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:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -943,7 +1005,7 @@ msgstr ""
 "<i><b>Figyelem:</b> Nincs elegendő metaadat a fájl teljes átnevezéshez. "
 "Kérem válasszon más metaadatot az átnevezéshez.</i>"
 
-#: rapid/preferencesdialog.py:1509
+#: rapid/preferencesdialog.py:1524
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -952,13 +1014,13 @@ msgstr ""
 "Kérem válasszon más metaadatot az alkönyvtár létrehozáshoz.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/preferencesdialog.py:1512
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Példa: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1602
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -968,7 +1030,7 @@ msgstr ""
 "A %(filetype)s alkönyvtár beállítások érvénytelenek, nem használhatóak.\n"
 "Az alapértelmezett értékek kerülnek visszaállításra."
 
-#: rapid/preferencesdialog.py:1747
+#: rapid/preferencesdialog.py:1762
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -979,7 +1041,7 @@ msgstr ""
 "javítod ki őket:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1749
+#: rapid/preferencesdialog.py:1764
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -989,142 +1051,147 @@ msgstr ""
 "Ez a reguláris kifejezés hibás,  és távolításra kerül, ha nem javítod ki:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1765
 msgid "Invalid regular expression"
 msgstr "Érvénytelen reguláris kifejezés"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1931
+#: rapid/preferencesdialog.py:1949
 msgid "externaldrive1"
 msgstr "külső_meghajtó1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1933
+#: rapid/preferencesdialog.py:1951
 msgid "externaldrive2"
 msgstr "külső_meghajtó2"
 
-#: 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 "Prága"
 
-#: 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 "Teherán"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Paris"
 msgstr "Párizs"
 
-#: 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 "Róma"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Moscow"
 msgstr "Moszkva"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Warsaw"
 msgstr "Varsó"
 
-#: 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:363
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
 msgstr "alkönyvtár"
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:361
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr "fájlnév"
 
-#: rapid/problemnotification.py:80
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr "Ez a dátim, idő érték nem tűnik valósnak: %s"
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:86
 msgid "Filename does not have an extension."
 msgstr "A fájlnévnek nincs kiterjesztése."
 
 #. a number component is something like the 8346 in IMG_8346.JPG
-#: rapid/problemnotification.py:83
+#: rapid/problemnotification.py:88
 msgid "Filename does not have a number component."
 msgstr "A fájlnévnek nincs szám része."
 
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr "Hiba a komponens elkészítésekor: %s."
 
 #. a generic problem
-#: rapid/problemnotification.py:86
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr "%(filetype)s métadatatát nem tudom olvasni"
 
-#: rapid/problemnotification.py:88
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "%(filetype)s %(area)s nem lehet létrehozni"
 
-#: rapid/problemnotification.py:90 rapid/problemnotification.py:91
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr "Hiba lépett fel a %(filetype)s másolása közben"
 
-#: rapid/problemnotification.py:93 rapid/problemnotification.py:94
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr "A  %(filetype)s letöltése nem volt hibátlan."
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "%(filetype)s már létezik (le van töltve)"
 
-#: rapid/problemnotification.py:97
+#: rapid/problemnotification.py:105
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1133,7 +1200,7 @@ msgstr ""
 "%(filetype)s biztonsági mentése nem készül el, mert nincs használható hely "
 "számára"
 
-#: rapid/problemnotification.py:102
+#: rapid/problemnotification.py:110
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -1142,12 +1209,12 @@ msgstr ""
 "A %(image1)s kép %(image1_date)s %(image1_time)s kor készült és, a "
 "%(image2)s kép %(image2_date)s %(image2_time)s kor készült."
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "%(filetype)s már le van töltve"
 
-#: rapid/problemnotification.py:107
+#: rapid/problemnotification.py:115
 #, python-format
 msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
@@ -1156,26 +1223,33 @@ msgstr ""
 "A létező %(filetype)s  típus utoljára %(date)s %(time)s lett módosítva.\r\n"
 "Az alábbi azonosító hozzáadva: %(identifier)s"
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:116
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr "A létező %(filetype)s módosítva lett: %(date)s  %(time)s."
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:117
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr "Nincs adat a %(filetype)s elnevezéséhez"
 
-#: rapid/problemnotification.py:111
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Hiba: %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:201
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+"A fájl ellenőrzés hibát talált. A letöltött verzió eltér az eredetitől."
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr "A métadatad hibás lehet"
 
-#: rapid/problemnotification.py:204
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
@@ -1183,217 +1257,235 @@ msgstr ""
 "A fájlnév, a kiterjesztés, és az Exif információ szerint ez már le van "
 "töltve."
 
-#: rapid/problemnotification.py:223
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " Biztonsági mentés létrehozva: %(volume)s"
 
-#: rapid/problemnotification.py:225
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr " Biztonsági mentés létrehozva ezeken az eszközökön: "
 
-#: rapid/problemnotification.py:227 rapid/problemnotification.py:288
-#: rapid/problemnotification.py:300
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s és %(final_volume)s."
 
-#: rapid/problemnotification.py:240
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
 "%(details)s"
 msgstr "A fényképeknek azonos a neve, de eltérő időben készültek:%(details)s"
 
-#: rapid/problemnotification.py:257
+#: rapid/problemnotification.py:269
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr ""
 "Hiba történt a biztonsági mentés közben ezen az eszközön: %(volume)s: "
 "%(inst)s."
 
-#: rapid/problemnotification.py:259
+#: rapid/problemnotification.py:271
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr "Hiba történt a biztonsági mentés közben ezen az eszközön %(volume)s."
 
-#: rapid/problemnotification.py:261
+#: rapid/problemnotification.py:273
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr "Hiba történt a biztonsági mentés közben az alábbi eszközökön: "
 
-#: rapid/problemnotification.py:265 rapid/problemnotification.py:313
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:267
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:271 rapid/problemnotification.py:315
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr "%(volumes)s és %(volume)s (%(inst)s)."
 
-#: rapid/problemnotification.py:276
+#: rapid/problemnotification.py:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s és %(volume)s."
 
-#: rapid/problemnotification.py:284
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "A biztonsági mentés már létezik itt: %(volume)s."
 
-#: rapid/problemnotification.py:286
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr "A biztonsági mentés az elábbi eszközökön már létezik: "
 
-#: rapid/problemnotification.py:296
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "A biztonsági mentés felülírva ezen az eszközön: %(volume)s."
 
-#: rapid/problemnotification.py:298
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr "A biztonsági mentés felülírva ezeken az eszközökön: "
 
-#: rapid/problemnotification.py:309
+#: rapid/problemnotification.py:321
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr ""
 "Hiba lépett fel a könyvtárak létrehozáskor ezen az eszközön: %(volume)s: "
 "%(inst)s."
 
-#: rapid/problemnotification.py:311
+#: rapid/problemnotification.py:323
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr "Hiba lépett fel a könyvtárak létrehozáskor ezen az eszközökön: "
 
-#: rapid/problemnotification.py:322
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+"A fájl ellenőrzés hibát talált a %(volume)s. A letöltött verzió eltér az "
+"eredetitől."
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr "A fájl ellenörzés hibát talált ezen az eszközön: "
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "%(previousproblem)s továbbá, %(newproblem)s"
 
-#: rapid/problemnotification.py:330
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " Továbbá, még ezek %(problems)s."
 
-#: rapid/problemnotification.py:332
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " Továbbá, még ez %(problem)s."
 
-#: rapid/problemnotification.py:341
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "A %(type)s métaadat hiányzik."
 
-#: rapid/problemnotification.py:343
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr "A következő métaadatad hiányzik: "
 
-#: rapid/problemnotification.py:346
+#: rapid/problemnotification.py:371
 #, python-format
 msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr "%(missing_metadata_elements)s és %(final_missing_metadata_element)s."
 
-#: rapid/problemnotification.py:363
+#: rapid/problemnotification.py:388
 msgid "Problems in subfolder and filename generation"
 msgstr "Probléma az alkönyvtár és a fájlnév létrehozásakor"
 
-#: rapid/problemnotification.py:365
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr "Probléma az alkönyvtár és a fájlnév létrehozásakor"
 
-#: rapid/problemnotification.py:368
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Probléma a %s létrehozásakor"
 
-#: rapid/problemnotification.py:370
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Probléma a %s létrehozásakor"
 
-#: rapid/problemnotification.py:379
+#: rapid/problemnotification.py:404
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr "%(filetype)s már létezik, de biztonsági mentés létrehozva"
 
-#: rapid/problemnotification.py:381
+#: rapid/problemnotification.py:406
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 "Hiba történt a %(filetype)s másolásakor, de a biztonsági mentés létrehozva."
 
-#: rapid/problemnotification.py:401
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr "Több probléma lépett fel."
 
-#: rapid/problemnotification.py:403 rapid/subfolderfile.py:230
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 "A program egyező nevű, de különböző időpontban készített képeket talált."
 
-#: rapid/problemnotification.py:409
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr "hibák voltak a biztonsági mentés közben"
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr "Hibák voltak a biztonsági mentés közben"
 
-#: rapid/problemnotification.py:412
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr "hiba volt a biztonsági mentés közben"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr "Hiba volt a biztonsági mentés közben"
 
 #. e.g.
-#: rapid/problemnotification.py:416
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, és %(backinguperror)s"
 
-#: rapid/rpdfile.py:139
+#: rapid/rpdfile.py:159
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/subfolderfile.py:79
+#: rapid/rpdfile.py:169
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
+msgstr "keresés  (found %(photos)s photos and %(videos)s videos)..."
+
+#: rapid/subfolderfile.py:81
 #, 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:325
+msgid "subfolder and filename"
+msgstr "alkönyvtár és file neve"
+
+#: rapid/subfolderfile.py:406
 msgid "Photo has already been downloaded"
 msgstr "A kép már korábban le lett töltve."
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:407
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Forrás: %(source)s"
 
-#: rapid/subfolderfile.py:359
-msgid "subfolder and filename"
-msgstr "alkönyvtár és file neve"
-
-#: rapid/subfolderfile.py:397
+#: rapid/subfolderfile.py:485
 msgid "Failed to create download subfolder"
 msgstr "Nem sikerült az alkönyvtár létrehozás"
 
-#: rapid/subfolderfile.py:398
+#: rapid/subfolderfile.py:486
 #, python-format
 msgid "Path: %s"
 msgstr "Path: %s"
@@ -1403,296 +1495,298 @@ msgid "About..."
 msgstr "Névjegy…"
 
 #: rapid/glade3/rapid.ui.h:2
-msgid "Check All"
-msgstr "Összes kijelölése"
+msgid "_Check All"
+msgstr "Összes _kijelölése"
 
 #: rapid/glade3/rapid.ui.h:3
 msgid "Check All Photos"
-msgstr "Összes fénykép kijelölése"
+msgstr "Kijelöl minden fényképet"
 
 #: rapid/glade3/rapid.ui.h:4
 msgid "Check All Videos"
-msgstr "Összes videó kijelölése"
+msgstr "Kijelöl minden videót"
 
-#: rapid/glade3/rapid.ui.h:6
-msgid "Download / Pause"
-msgstr "Letöltés / Megszakítás"
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "_Küldjön adományt..."
 
 #: rapid/glade3/rapid.ui.h:7
-msgid "Get Help Online..."
-msgstr "Online segítség…"
+msgid "_Get Help Online..."
+msgstr "_Online help"
 
 #: rapid/glade3/rapid.ui.h:8
 msgid "Help"
 msgstr "Súgó"
 
 #: rapid/glade3/rapid.ui.h:9
-msgid "Make a Donation..."
-msgstr "Adomány, támogatás..."
+msgid "Preferences"
+msgstr "Beállítások"
 
 #: rapid/glade3/rapid.ui.h:10
-msgid "Next File"
-msgstr "Következő fájl"
+msgid "Quit"
+msgstr "Kilépés"
 
 #: rapid/glade3/rapid.ui.h:11
-msgid "Preferences"
-msgstr "Beállítások"
+msgid "Refresh"
+msgstr "Újratöltés"
 
 #: rapid/glade3/rapid.ui.h:12
-msgid "Previous File"
-msgstr "Előző fájl"
+msgid "_Report a Problem..."
+msgstr "_Hibajelentés küldése..."
 
 #: rapid/glade3/rapid.ui.h:13
-msgid "Quit"
-msgstr "Kilépés"
+msgid "Translate this Application..."
+msgstr "Ezen alkalmazás fordítása…"
 
-#: rapid/glade3/rapid.ui.h:15
-msgid "Refresh"
-msgstr "Frissítés"
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr "_Kijelölések törlése"
 
 #: rapid/glade3/rapid.ui.h:16
-msgid "Report a Problem..."
-msgstr "Hiba jelentése…"
+msgid "_File"
+msgstr "_Fájl"
 
 #: rapid/glade3/rapid.ui.h:17
-msgid "Select All Wit_h Job Code"
-msgstr "Összes kijelölése_Munka-kód szerint"
+msgid "Download / Pause"
+msgstr "Letöltés / Megszakítás"
 
 #: rapid/glade3/rapid.ui.h:18
-msgid "Select All Without _Job Code"
-msgstr "Összes kijelölése_Munka-kód nélkül"
+msgid "_Select"
+msgstr "_Kijelölés"
 
 #: rapid/glade3/rapid.ui.h:19
-msgid "Translate this Application..."
-msgstr "Ezen alkalmazás fordítása..."
+msgid "Select All Without _Job Code"
+msgstr "Összes kijelölése_Munka-kód nélkül"
 
 #: rapid/glade3/rapid.ui.h:20
-msgid "Uncheck All"
-msgstr "A kijelölések megszüntetése"
+msgid "Select All Wit_h Job Code"
+msgstr "Összes kijelölése_Munka-kód szerint"
 
 #: rapid/glade3/rapid.ui.h:21
-msgid "_Check All"
-msgstr "Összes _kijelölése"
+msgid "_View"
+msgstr "_Nézet"
 
 #: rapid/glade3/rapid.ui.h:22
-msgid "_Clear Completed Downloads"
-msgstr "_Kész letöltések kiürítése"
+msgid "_Error Log"
+msgstr "_Hibanapló"
 
 #: rapid/glade3/rapid.ui.h:23
-msgid "_Download"
-msgstr "_Letöltés"
+msgid "_Clear Completed Downloads"
+msgstr "_Kész letöltések kiürítése"
 
 #: rapid/glade3/rapid.ui.h:24
-msgid "_Error Log"
-msgstr "_Hibanapló"
+msgid "Previous File"
+msgstr "Előző fájl"
 
 #: rapid/glade3/rapid.ui.h:25
-msgid "_File"
-msgstr "_Fájl"
+msgid "Next File"
+msgstr "Következő fájl"
 
 #: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
 msgstr "_Súgó"
 
 #: rapid/glade3/rapid.ui.h:27
-msgid "_Include in download"
-msgstr "Letöltésben szerepel"
-
-#: rapid/glade3/rapid.ui.h:28
-msgid "_Make a Donation..."
-msgstr "_Küldjön adományt..."
-
-#: rapid/glade3/rapid.ui.h:29
-msgid "_Select"
-msgstr "_Kijelölés"
-
-#: rapid/glade3/rapid.ui.h:30
 msgid "_Translate this Application..."
 msgstr "_Fordítás"
 
-#: rapid/glade3/rapid.ui.h:31
-msgid "_Uncheck All"
-msgstr "_Kijelölések törlése"
+#: rapid/glade3/rapid.ui.h:28
+msgid "_Include in download"
+msgstr "Letöltésben szerepel"
 
-#: rapid/glade3/rapid.ui.h:32
-msgid "_View"
-msgstr "_Nézet"
+#: rapid/glade3/rapid.ui.h:29
+msgid "_Download"
+msgstr "_Letöltés"
 
 #: rapid/glade3/prefs.ui.h:1
-msgid " "
-msgstr " "
+msgid "Preferences: Rapid Photo Downloader"
+msgstr "Beállítások: Gyors Fénykép Letöltő"
 
 #: rapid/glade3/prefs.ui.h:2
-msgid " hh:mm"
-msgstr " óó:pp"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">A Fényképek Letöltési Könyvtára</span>"
 
 #: rapid/glade3/prefs.ui.h:3
-msgid ":"
-msgstr ":"
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr "<i>Például: /home/jozsef/Képek</i>"
 
 #: rapid/glade3/prefs.ui.h:4
-msgid "<b>Backup</b>"
-msgstr "<b>Biztonsági mentés</b>"
+msgid "<b>Download Subfolders</b>"
+msgstr "<b>Letöltési alkönyvtár</b>"
 
 #: rapid/glade3/prefs.ui.h:5
-msgid "<b>Compatibility with Other Operating Systems</b>"
-msgstr "<b>Kompatibilitás egyéb operációs rendszerekkel</b>"
+msgid "Download folder:"
+msgstr "Letöltési könyvtár:"
 
 #: rapid/glade3/prefs.ui.h:6
-msgid "<b>Download Folder</b>"
-msgstr "<b>Letöltési könyvtár</b>"
+msgid ""
+"Choose the download folder. Subfolders for the downloaded photos will be "
+"automatically created in this folder using the structure specified below."
+msgstr ""
+"Válaszd ki a letöltési könyvtárat. Az alkönyvtárak automatikusan létre "
+"fognak jönni az általad megadott könyvtár alá."
 
 #: rapid/glade3/prefs.ui.h:7
-msgid "<b>Download Subfolders</b>"
-msgstr "<b>Letöltési alkönyvtár</b>"
+msgid "<b>Download Folder</b>"
+msgstr "<b>Letöltési könyvtár</b>"
 
 #: rapid/glade3/prefs.ui.h:8
-msgid "<b>Example</b>"
-msgstr "<b>Példa:</b>"
+msgid "Photo Folders"
+msgstr "Fénykép Könyvtár"
 
 #: rapid/glade3/prefs.ui.h:9
-msgid "<b>Job Codes</b>"
-msgstr "<b>Munka-szám</b>"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Fénykép Átnevezés</span>\t"
 
 #: rapid/glade3/prefs.ui.h:10
 msgid "<b>Photo Rename</b>"
 msgstr "<b>Fénykép Átnevezés</b>"
 
 #: rapid/glade3/prefs.ui.h:11
-msgid "<b>Photo and Video Name Conflicts</b>"
-msgstr "<b>Fénykép és Videó név összeütközés</b>"
+msgid " "
+msgstr " "
 
 #: rapid/glade3/prefs.ui.h:12
-msgid "<b>Program Automation</b>"
-msgstr "<b>Automatizálás</b>"
+msgid "<i>New:</i>"
+msgstr "<i>Új:</i>"
 
 #: rapid/glade3/prefs.ui.h:13
-msgid "<b>Sequence Numbers</b>"
-msgstr "<b>Sorozat szám</b>"
+msgid "<i>Original:</i>"
+msgstr "<i>Eredeti:</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>Példa:</b>"
 
 #: rapid/glade3/prefs.ui.h:15
-msgid "<i>Example: /home/user/Pictures</i>"
-msgstr "<i>Például: /home/jozsef/Képek</i>"
+msgid "Photo Rename"
+msgstr "Fénykép Átnevezés"
 
 #: rapid/glade3/prefs.ui.h:16
-msgid "<i>Example:</i>"
-msgstr "<i>Példa:</i>"
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Videók Letöltési Könyvtára</span>"
 
 #: rapid/glade3/prefs.ui.h:17
-msgid "<i>New:</i>"
-msgstr "<i>Új:</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 ""
+"Sajnálom, a videó letöltési lehetőség le van tiltva. A videó letöltéshez, "
+"kérlek telepítsd <i>hachoir metadata</i> és a <i>kaa metadata</i> csomagokat "
+"a python részére, vagy az <i>exiftool</i> csomagot."
 
 #: rapid/glade3/prefs.ui.h:18
-msgid "<i>Original:</i>"
-msgstr "<i>Eredeti:</i>"
+msgid ""
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
+msgstr ""
+"Válaszd ki a letöltési könyvtárat. Az alkönyvtárak automatikusan létre "
+"fognak jönni az általad megadott könyvtár alá."
 
 #: rapid/glade3/prefs.ui.h: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 "Videó Könyvtár"
 
 #: rapid/glade3/prefs.ui.h:20
-msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Eszköz beállítások</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Videó Átnevezés</span>\t"
 
 #: rapid/glade3/prefs.ui.h:21
-msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Eszközök</span>"
+msgid "Video Rename"
+msgstr "Videó Átnevezés"
 
 #: rapid/glade3/prefs.ui.h:22
-msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Átnevezési lehetőségek</span>"
 
 #: rapid/glade3/prefs.ui.h:23
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Munka-szám</span>"
+msgid "<b>Sequence Numbers</b>"
+msgstr "<b>Sorozat szám</b>"
 
 #: rapid/glade3/prefs.ui.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Egyebek</span>"
+msgid ""
+"Specify the time in 24 hour format at which the <i>Downloads today</i> "
+"sequence number should be reset."
+msgstr ""
+"Határozza meg azt az időt 24 órás formában, ahol a <i>Downloads today</i> "
+"sorozatszámot vissza kell állítani."
 
 #: rapid/glade3/prefs.ui.h:25
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"x-large\">A Fényképek Letöltési Könyvtára</span>"
+msgid "Day start:"
+msgstr "Nap kezdete:"
 
 #: rapid/glade3/prefs.ui.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">Fénykép Átnevezés</span>\t"
+msgid "Downloads today:"
+msgstr "Mai letöltések:"
 
 #: rapid/glade3/prefs.ui.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Átnevezési lehetőségek</span>"
+msgid "Stored number:"
+msgstr "Tárolt szám:"
 
 #: rapid/glade3/prefs.ui.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Videók Letöltési Könyvtára</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\">Videó Átnevezés</span>\t"
+msgid " hh:mm"
+msgstr " óó:pp"
 
 #: rapid/glade3/prefs.ui.h:30
-msgid "Add unique identifier"
-msgstr "Egyedi azonosító megadása"
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "RAW és JPEG fájlok számkiosztásának szinkronizálása"
 
 #: rapid/glade3/prefs.ui.h:31
-msgid "Automatically detect Portable Storage Devices"
-msgstr "Hordozható eszközök automatikus érzékelése"
+msgid "<b>Compatibility with Other Operating Systems</b>"
+msgstr "<b>Kompatibilitás egyéb operációs rendszerekkel</b>"
 
 #: rapid/glade3/prefs.ui.h:32
-msgid "Automatically detect backup devices"
-msgstr "Biztonsági mentés eszközök automatikus érzékelése"
+msgid ""
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
+msgstr ""
+"Adja meg, hogy a képek és videók nevéből el legyenek-e távolítva az egyéb "
+"operációs rendszerek által nem megengedett karakterek."
 
 #: rapid/glade3/prefs.ui.h:33
-msgid "Automatically detect devices"
-msgstr "Az eszközök automatikus felismerése"
+msgid "Strip incompatible characters"
+msgstr "Az inkompatibilis karakterek kihagyása"
 
 #: rapid/glade3/prefs.ui.h:34
-msgid "Automatically rotate JPEG images"
-msgstr "A JPEG képek automatikus forgatása"
+msgid "Rename Options"
+msgstr "Átnevezési lehetőségek"
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup"
-msgstr "Biztonsági mentés"
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Munka-szám</span>"
 
 #: rapid/glade3/prefs.ui.h:36
-msgid "Backup photos and videos when downloading"
-msgstr "A fényképek és vidók biztonsági mentése letöltés közben"
+msgid "<b>Job Codes</b>"
+msgstr "<b>Munka-szám</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 ""
-"Válaszd ki a letöltési könyvtárat. Az alkönyvtárak automatikusan létre "
-"fognak jönni az általad megadott könyvtár alá."
-
-#: rapid/glade3/prefs.ui.h:38
-msgid ""
-"Choose the download folder. Subfolders for the downloaded videos will be "
-"automatically created in this folder using the structure specified below."
-msgstr ""
-"Válaszd ki a letöltési könyvtárat. Az alkönyvtárak automatikusan létre "
-"fognak jönni az általad megadott könyvtár alá."
+msgid "_Add..."
+msgstr "_Hozzáadás…"
 
 #: rapid/glade3/prefs.ui.h:39
-msgid "Day start:"
-msgstr "Nap kezdete:"
+msgid "R_emove All"
+msgstr "Összes törlése"
 
 #: rapid/glade3/prefs.ui.h:40
-msgid "Device Options"
-msgstr "Eszköz beállítások"
+msgid "Job Codes"
+msgstr "Munka-szám"
 
 #: rapid/glade3/prefs.ui.h:41
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Eszközök</span>"
+
+#: rapid/glade3/prefs.ui.h:42
 msgid "Devices"
 msgstr "Eszközök"
 
-#: 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"
@@ -1716,37 +1810,31 @@ msgstr ""
 "fényképezőgépet PTP módba állítani. Ha ez nem lehetséges használj "
 "kártyaolvasót.</i>"
 
-#: rapid/glade3/prefs.ui.h:47
-msgid "Download folder:"
-msgstr "Letöltési könyvtár:"
-
 #: rapid/glade3/prefs.ui.h:48
-msgid "Downloads today:"
-msgstr "Mai letöltések:"
+msgid "Automatically detect Portable Storage Devices"
+msgstr "Hordozható eszközök automatikus érzékelése"
 
 #: rapid/glade3/prefs.ui.h:49
-msgid "Error Handling"
-msgstr "Hibakezelés"
+msgid "Automatically detect devices"
+msgstr "Az eszközök automatikus felismerése"
 
 #: 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 ""
-"Kilépés a programból letöltési hibák és figyelmeztetések ellenére is."
-
-#: rapid/glade3/prefs.ui.h:51
-msgid "Exit program when download completes"
-msgstr "Kilépés a programból a letöltés végeztével"
-
-#: rapid/glade3/prefs.ui.h:52
-msgid "Generate thumbnails (slower)"
-msgstr "Bélyegkép létrehozás (lassabb)"
+"Ha engedélyezed az automatikus felderítést a hordozható eszközre, akkor az "
+"egész eszközön fogok keresni. Nagy méretű eszközön ez sokáig tarthat. \n"
+"\n"
+"Ha ez a lehetőség engedélyezve van, akkor a lehetséges eszköz érzékelésekor "
+"rá fogok kérdezni, hogy akarod-e az automatikus felderítést ezen az eszközön."
 
 #: rapid/glade3/prefs.ui.h:53
-msgid ""
-"If you disable automatic detection, choose the exact backup locations."
-msgstr ""
-"Kérlek válassz könyvtárt a biztonsági mentésnek, ha nem akarod hogy "
-"automatikusan kerüljön meghatározásra (disable auto detection)."
+msgid "Location:"
+msgstr "Hely:"
 
 #: rapid/glade3/prefs.ui.h:54
 msgid ""
@@ -1757,186 +1845,182 @@ msgstr ""
 "automatikusan kerüljenek meghatározásra (disable auto detection)."
 
 #: rapid/glade3/prefs.ui.h:55
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Eszköz beállítások</span>"
+
+#: rapid/glade3/prefs.ui.h:56
+msgid "Remembered Paths"
+msgstr "Megjegyzett elérési utak"
+
+#: 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 ""
-"Ha engedélyezed az automatikus felderítést a hordozható eszközre, akkor az "
-"egész eszközön fogok keresni. Nagy méretű eszközön ez sokáig tarthat. \n"
-"\n"
-"Ha ez a lehetőség engedélyezve van, akkor a lehetséges eszköz érzékelésekor "
-"rá fogok kérdezni, hogy akarod-e az automatikus felderítést ezen az eszközön."
+"Megjegyzett útvonalak azok, amelyeket a különböző hordozható eszközökkel "
+"kapcsolatban kiválasztasz letöltésre vagy mellőzésre."
 
 #: rapid/glade3/prefs.ui.h:58
 msgid "Ignored Paths"
 msgstr "Mellőzött útvonal"
 
 #: rapid/glade3/prefs.ui.h:59
-msgid "Job Codes"
-msgstr "Munka-szám"
-
-#: rapid/glade3/prefs.ui.h:60
-msgid "Location:"
-msgstr "Hely:"
+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 ""
+"Add meg azt az útvonal végződést amit figyelmen kívül hagyjak  amikor "
+"fotókat vagy videókat keresek a letöltéshez. Bármilyen útvonal ami a "
+"megadott értékre végződik nem lesz ellenőrizve."
 
 #: rapid/glade3/prefs.ui.h:61
-msgid "Miscellaneous"
-msgstr "Egyebek"
+msgid "Re_move All"
+msgstr "Ö_sszes eltávolítása"
 
 #: rapid/glade3/prefs.ui.h:62
-msgid "Overwrite"
-msgstr "Felülírás"
+msgid "Use _python-style regular expressions"
+msgstr "Használj python stílusú reguláris kifejezést"
 
 #: rapid/glade3/prefs.ui.h:63
-msgid "Performance"
-msgstr "Teljesítmény"
+msgid "Device Options"
+msgstr "Eszköz beállítások"
 
 #: rapid/glade3/prefs.ui.h:64
-msgid "Photo Folders"
-msgstr "Fénykép Könyvtár"
+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 "Fénykép Átnevezés"
+msgid "<b>Backup</b>"
+msgstr "<b>Biztonsági mentés</b>"
 
 #: rapid/glade3/prefs.ui.h:66
-msgid "Photo backup folder name:"
-msgstr "A biztonsági másolat mappa neve:"
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
+msgstr ""
+"Kérlek válassz könyvtárt a biztonsági mentésnek, ha nem akarod hogy "
+"automatikusan kerüljön meghatározásra (disable auto detection)."
 
 #: rapid/glade3/prefs.ui.h:67
-msgid "Photo backup location:"
-msgstr "Fotók biztonsági mentésének helye:"
+msgid "Automatically detect backup devices"
+msgstr "Biztonsági mentés eszközök automatikus érzékelése"
 
 #: rapid/glade3/prefs.ui.h:68
-msgid "Preferences: Rapid Photo Downloader"
-msgstr "Beállítások: Gyors Fénykép Letöltő"
+msgid ""
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
+msgstr ""
+"A képekről és videókról letöltés közben több másolat készülhet, különböző "
+"helyekre, például külső merevlemezre."
 
-#: rapid/glade3/prefs.ui.h:70
-msgid "R_emove All"
-msgstr "Összes törlése"
+#: rapid/glade3/prefs.ui.h:69
+msgid "Back up photos and videos when downloading"
+msgstr "A fényképek és vidók biztonsági mentése letöltés közben"
 
-#: rapid/glade3/prefs.ui.h:72
-msgid "Re_move All"
-msgstr "Ö_sszes eltávolítása"
+#: 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 "Adja meg a könyvtárat, ahová a biztonsági másolatok készülnek."
 
 #: rapid/glade3/prefs.ui.h:73
-msgid "Remembered Paths"
-msgstr "Megjegyzett elérési utak"
+msgid "Photo backup location:"
+msgstr "Fotók biztonsági mentésének helye:"
 
 #: 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 ""
-"Megjegyzett útvonalak azok, amelyeket a különböző hordozható eszközökkel "
-"kapcsolatban kiválasztasz letöltésre vagy mellőzésre."
+msgid "Photo backup folder name:"
+msgstr "A biztonsági másolat mappa neve:"
 
 #: rapid/glade3/prefs.ui.h:75
-msgid "Rename Options"
-msgstr "Átnevezési lehetőségek"
+msgid "<i>Example:</i>"
+msgstr "<i>Példa:</i>"
 
 #: rapid/glade3/prefs.ui.h:76
-msgid "Skip"
-msgstr "Kihagyás"
+msgid "<i>/media/externaldrive/Photos</i>"
+msgstr "<i>/media/externaldrive/Photos</i>"
 
 #: rapid/glade3/prefs.ui.h:77
-msgid "Skip download"
-msgstr "A letöltés kihagyása"
+msgid "Video backup folder name:"
+msgstr "A videó biztonsági mentési könyvtára"
 
 #: 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 ""
-"Sajnálom, a videó letöltési lehetőség le van tiltva. A videó letöltéshez, "
-"kérlek telepítsd <i>hachoir metadata</i> és a <i>kaa metadata</i> csomagokat "
-"a python részére, vagy az <i>exiftool</i> csomagot."
+msgid "Video backup location:"
+msgstr "Videó biztonsági mentésének helye:"
 
 #: 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."
+msgid "Back up"
 msgstr ""
-"Add meg azt az útvonal végződést amit figyelmen kívül hagyjak  amikor "
-"fotókat vagy videókat keresek a letöltéshez. Bármilyen útvonal ami a "
-"megadott értékre végződik nem lesz ellenőrizve."
 
 #: 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 "Adja meg a könyvtárat, ahová a biztonsági másolatok készülnek."
+msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Egyebek</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 ""
-"Határozza meg azt az időt 24 órás formában, ahol a <i>Downloads today</i> "
-"sorozatszámot vissza kell állítani."
+#: rapid/glade3/prefs.ui.h:81
+msgid "<b>Program Automation</b>"
+msgstr "<b>Automatizálás</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 ""
-"Adja meg, hogy a képek és videók nevéből el legyenek-e távolítva az egyéb "
-"operációs rendszerek által nem megengedett karakterek."
+#: rapid/glade3/prefs.ui.h:82
+msgid "Unmount (\"eject\") device upon download completion"
+msgstr "A készülék lecsatlakoztatása a letöltést követően."
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:83
 msgid "Start downloading at program startup"
 msgstr "A letöltés megkezdése a program indításakor"
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:84
 msgid "Start downloading upon device insertion"
 msgstr "Azonnali letöltés a készülék csatlakoztatását követően."
 
-#: rapid/glade3/prefs.ui.h:87
-msgid "Stored number:"
-msgstr "Tárolt szám:"
+#: rapid/glade3/prefs.ui.h:85
+msgid "Exit program when download completes"
+msgstr "Kilépés a programból a letöltés végeztével"
 
-#: rapid/glade3/prefs.ui.h:88
-msgid "Strip incompatible characters"
-msgstr "Az inkompatibilis karakterek kihagyása"
+#: rapid/glade3/prefs.ui.h:86
+msgid "Exit program even if download had warnings or errors"
+msgstr ""
+"Kilépés a programból letöltési hibák és figyelmeztetések ellenére is."
+
+#: rapid/glade3/prefs.ui.h:87
+msgid "Automatically rotate JPEG images"
+msgstr "A JPEG képek automatikus forgatása"
 
 #: rapid/glade3/prefs.ui.h:89
-msgid "Synchronize RAW + JPEG sequence numbers"
-msgstr "RAW és JPEG fájlok számkiosztásának szinkronizálása"
+msgid "Verify files as they are downloaded"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:90
-msgid "Unmount (\"eject\") device upon download completion"
-msgstr "A készülék lecsatlakoztatása a letöltést követően."
+msgid "Performance"
+msgstr "Teljesítmény"
 
 #: rapid/glade3/prefs.ui.h:91
-msgid "Use _python-style regular expressions"
-msgstr "Használj python stílusú reguláris kifejezést"
+msgid "Generate thumbnails (slower)"
+msgstr "Bélyegkép létrehozás (lassabb)"
 
 #: rapid/glade3/prefs.ui.h:92
-msgid "Video Folders"
-msgstr "Videó Könyvtár"
+msgid "Miscellaneous"
+msgstr "Egyebek"
 
 #: rapid/glade3/prefs.ui.h:93
-msgid "Video Rename"
-msgstr "Videó Átnevezés"
+msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 
 #: rapid/glade3/prefs.ui.h:94
-msgid "Video backup folder name:"
-msgstr "A videó biztonsági mentési könyvtára"
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr "<b>Fénykép és Videó név összeütközés</b>"
 
 #: rapid/glade3/prefs.ui.h:95
-msgid "Video backup location:"
-msgstr "Videó biztonsági mentésének helye:"
+msgid "Add unique identifier"
+msgstr "Egyedi azonosító megadása"
 
 #: rapid/glade3/prefs.ui.h:96
+msgid "Skip download"
+msgstr "A letöltés kihagyása"
+
+#: rapid/glade3/prefs.ui.h:97
 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."
@@ -1944,7 +2028,7 @@ msgstr ""
 "Ha egyező nevű kép vagy videó már le lett töltve, ajánlja fel a kihagyást, "
 "vagy a letöltés folytatását egyedi azonosító hozzáadásával"
 
-#: rapid/glade3/prefs.ui.h:97
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1952,17 +2036,17 @@ msgstr ""
 "Adja meg, hogy a biztonsági másolatok készítésekor felül legyenek-e írva az "
 "azonos néven létező fájlok, vagy át legyenek ugorva."
 
-#: rapid/glade3/prefs.ui.h:98
-msgid ""
-"You can have your photos and videos backed up to multiple locations as they "
-"are downloaded, e.g. external hard drives."
-msgstr ""
-"A képekről és videókról letöltés közben több másolat készülhet, különböző "
-"helyekre, például külső merevlemezre."
-
 #: rapid/glade3/prefs.ui.h:99
-msgid "_Add..."
-msgstr "_Hozzáadás…"
+msgid "Overwrite"
+msgstr "Felülírás"
+
+#: rapid/glade3/prefs.ui.h:100
+msgid "Skip"
+msgstr "Kihagyás"
+
+#: rapid/glade3/prefs.ui.h:101
+msgid "Error Handling"
+msgstr "Hibakezelés"
 
 #: rapid/glade3/about.ui.h:1
 msgid "Import your photos and videos efficiently and reliably"
@@ -2355,6 +2439,9 @@ msgstr "Importáld a fényképeidet és videóidat hatékonyan és megbízhatóa
 #~ msgid "Backup photos when downloading"
 #~ msgstr "Letöltéskor biztonsági mentés készítése"
 
+#~ msgid "Backup"
+#~ msgstr "Biztonsági mentés"
+
 #~ msgid "Backup folder name:"
 #~ msgstr "Biztonsági mentés könyvtár:"
 
@@ -2419,9 +2506,6 @@ msgstr "Importáld a fényképeidet és videóidat hatékonyan és megbízhatóa
 #~ msgid "Specify what to do when there are no backup devices."
 #~ msgstr "Határozza meg, mi a teendő, ha nincsen biztonsági mentés eszköz."
 
-#~ msgid "_Report a Problem..."
-#~ msgstr "_Hibajelentés küldése..."
-
 #~ msgid "_Photos"
 #~ msgstr "_Fényképek"
 
@@ -2432,9 +2516,6 @@ msgstr "Importáld a fényképeidet és videóidat hatékonyan és megbízhatóa
 #~ "A képek letöltésekor lehetséges biztonsági másolat készítése, pl. külső "
 #~ "merevlemezre."
 
-#~ msgid "_Get Help Online..."
-#~ msgstr "_Online help"
-
 #~ msgid "_Thumbnails"
 #~ msgstr "_Indexképek"
 
diff --git a/po/id.po b/po/id.po
index cedd95b..cb8e137 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,55 +7,55 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-04-30 15:03-0500\n"
-"PO-Revision-Date: 2011-05-01 23:38+0000\n"
-"Last-Translator: Wiebz <Unknown>\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:14+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-11 03:48+0000\n"
-"X-Generator: Launchpad (build 12981)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:105 rapid/glade3/rapid.ui.h:14
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: rapid/rapid.py:110
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
 "%(time)s"
 msgstr ""
 
-#: rapid/rapid.py:112
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr ""
 
-#: rapid/rapid.py:115
+#: rapid/rapid.py:127
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr ""
 
 #. Device refers to a thing like a camera, memory card in its reader,
 #. external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:149
+#: rapid/rapid.py:162
 msgid "Device"
 msgstr "Perangkat"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:166
+#: rapid/rapid.py:180
 msgid "Size"
 msgstr "Ukuran"
 
-#: rapid/rapid.py:169
+#: rapid/rapid.py:183
 msgid "Download Progress"
 msgstr ""
 
-#: rapid/rapid.py:315
+#: rapid/rapid.py:343
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr ""
@@ -64,19 +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:1171
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr ""
 
-#: rapid/rapid.py:1986 rapid/glade3/rapid.ui.h:5
+#. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
+#: rapid/rapid.py:1818
+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:1822
+#, python-format
+msgid "Downloading from %(location)s."
+msgstr ""
+
+#: rapid/rapid.py:1823
+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:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr "Unduh"
 
-#: rapid/rapid.py:1989
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr "Jeda"
 
-#: rapid/rapid.py:2092
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -87,7 +104,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2095
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -96,136 +113,187 @@ msgstr ""
 "Folder unduh ini tidak valid:\n"
 "%s"
 
-#: rapid/rapid.py:2096
+#: rapid/rapid.py:2380
 msgid "Download cannot proceed"
 msgstr "Mengunduh tidak dapat diproses"
 
-#: rapid/rapid.py:2385
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr ""
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr ""
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr ""
+
+#: rapid/rapid.py:2802
 msgid "About 1 second remaining"
 msgstr "Sisa 1 detik"
 
-#: rapid/rapid.py:2387
+#: rapid/rapid.py:2804
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Sisa %i detik"
 
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2806
 msgid "About 1 minute remaining"
 msgstr "Sisa 1 menit"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:2394
+#: rapid/rapid.py:2811
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Sisa %(minutes)i:%(seconds)02i menit"
 
-#: rapid/rapid.py:2416 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
 msgid "photos and videos"
 msgstr "Foto dan Video"
 
-#: rapid/rapid.py:2418 rapid/rpdfile.py:112
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
 msgid "photos or videos"
 msgstr "Foto dan Video"
 
-#: rapid/rapid.py:2421 rapid/rapid.py:2965 rapid/rpdfile.py:115
-msgid "videos"
-msgstr ""
-
-#: rapid/rapid.py:2423 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
-#: rapid/rpdfile.py:270
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
 msgid "video"
 msgstr ""
 
-#: rapid/rapid.py:2426 rapid/rapid.py:2963 rapid/preferencesdialog.py:825
-#: rapid/rpdfile.py:120
-msgid "photos"
-msgstr ""
-
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2428 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
-#: rapid/rpdfile.py:250
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
 msgid "photo"
 msgstr ""
 
-#: rapid/rapid.py:2455
+#: rapid/rapid.py:2872
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2459
+#: rapid/rapid.py:2876
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: rapid/rapid.py:2462 rapid/rapid.py:2514
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
 msgid "warnings"
 msgstr ""
 
-#: rapid/rapid.py:2471
+#: rapid/rapid.py:2892
 msgid "All downloads complete"
 msgstr ""
 
-#: rapid/rapid.py:2477 rapid/rapid.py:2486 rapid/rapid.py:2495
-#: rapid/rapid.py:2504 rapid/rapid.py:2512
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: rapid/rapid.py:2479 rapid/rapid.py:2497
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2488 rapid/rapid.py:2506
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2545
+#: rapid/rapid.py:2970
 #, 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:2552
+#: rapid/rapid.py:2977
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr ""
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:3331
+msgid "From"
+msgstr ""
+
+#: rapid/rapid.py:3339
+msgid "Auto Detect"
+msgstr ""
+
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
+#, python-format
+msgid "Select a folder containing %(file_types)s"
+msgstr ""
+
+#: rapid/rapid.py:3384
+msgid "Copy"
+msgstr ""
+
+#: rapid/rapid.py:3397
+msgid "Move"
+msgstr ""
+
+#: rapid/rapid.py:3419
+msgid "To"
+msgstr ""
+
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
+msgid "Photos:"
+msgstr "Foto:"
+
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
+msgid "Select a folder to download photos to"
+msgstr ""
+
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
+msgid "Videos:"
+msgstr "Video:"
+
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
+msgid "Select a folder to download videos to"
+msgstr ""
+
+#: rapid/rapid.py:3650
 msgid "and"
 msgstr "dan"
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:3655
 msgid "Using backup devices"
 msgstr ""
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3657
 msgid "Using backup device"
 msgstr ""
 
-#: rapid/rapid.py:2942
+#: rapid/rapid.py:3659
 msgid "No backup devices detected"
 msgstr ""
 
-#: rapid/rapid.py:2969
+#: rapid/rapid.py:3686
 msgid "Free space:"
 msgstr "Ruang kosong:"
 
 #. (videos) or (photos) will be appended to the free space message displayed to the
 #. user in the status bar.
 #. you should only translate this if your language does not use parantheses
-#: rapid/rapid.py:2981
+#: rapid/rapid.py:3698
 #, python-format
 msgid "(%(file_type)s)"
 msgstr ""
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
-#: rapid/rapid.py:2985
+#: rapid/rapid.py:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr ""
@@ -233,617 +301,701 @@ msgstr ""
 #. Inserted in the middle of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:2990
+#: rapid/rapid.py:3707
 msgid "; "
 msgstr "; "
 
 #. Inserted at the end of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:2995
+#: rapid/rapid.py:3712
 msgid "."
 msgstr "."
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
 #. e.g. 14.7GB available
-#: rapid/rapid.py:3001
+#: rapid/rapid.py:3718
 #, python-format
 msgid "%(free)s free"
 msgstr ""
 
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3726
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
+msgstr ""
+
 #. user manually specified backup location
-#: rapid/rapid.py:3007
+#: rapid/rapid.py:3729
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr ""
 
-#: rapid/rapid.py:3012
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3732
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr ""
+
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr ""
 
-#: rapid/rapid.py:3041
+#: rapid/rapid.py:3768
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: rapid/rapid.py:3146 rapid/rpdfile.py:251
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
 msgid "Photo"
 msgstr "Foto"
 
-#: rapid/rapid.py:3148 rapid/rpdfile.py:271
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:3157
+#: rapid/rapid.py:3921
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr ""
 
-#: rapid/rapid.py:3159 rapid/rapid.py:3173 rapid/rapid.py:3186
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
 msgid "Folder: %s"
 msgstr ""
 
-#: rapid/rapid.py:3171
+#: rapid/rapid.py:3935
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr ""
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3948
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr ""
 
-#: rapid/rapid.py:3262
+#: rapid/rapid.py:4034
 msgid "Thumbnails"
 msgstr "Miniatur gambar"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3309
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
 "(default: %default)"
 msgstr ""
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:4090
 msgid "display debugging information when run from the command line"
 msgstr ""
 
-#: rapid/rapid.py:3311
+#: rapid/rapid.py:4091
 msgid "only output errors to the command line"
 msgstr ""
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3313
+#: rapid/rapid.py:4093
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 
-#: rapid/rapid.py:3314
-msgid "reset all program settings and preferences and exit"
+#: rapid/rapid.py:4095
+msgid ""
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
 msgstr ""
 
-#: rapid/rapid.py:3327
-msgid "Photos:"
-msgstr "Foto:"
+#: rapid/rapid.py:4096
+msgid ""
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
+msgstr ""
 
-#: rapid/rapid.py:3327
-msgid "Videos:"
-msgstr "Video:"
+#: rapid/rapid.py:4097
+msgid "reset all program settings and preferences and exit"
+msgstr ""
+
+#: rapid/rapid.py:4110
+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:3332
+#: rapid/rapid.py:4133
 #, python-format
 msgid "and %s"
 msgstr "dan %s"
 
-#: rapid/rapid.py:3340
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
 msgstr ""
 
-#: rapid/rapid.py:3349
-msgid ""
-"Video downloading functionality disabled.\n"
-"To download videos, please install the hachoir metadata and kaa metadata "
-"packages for python."
-msgstr ""
-"Fungsi unduh video telah di non-aktifkan.\n"
-"Untuk mengunduh video, silahkan install paket hachoir metadata dan kaa "
-"metadata pada python."
-
-#: rapid/backupfile.py:139 rapid/backupfile.py:162
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
 msgid "Backing up error"
 msgstr ""
 
-#: rapid/backupfile.py:141
+#: rapid/backupfile.py:151
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr ""
 
-#: rapid/backupfile.py:143 rapid/backupfile.py:164 rapid/subfolderfile.py:194
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
 "Source: %(source)s\n"
 "Destination: %(destination)s"
 msgstr ""
 
-#: rapid/backupfile.py:146 rapid/backupfile.py:166
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
 msgid "Error: %(inst)s"
 msgstr ""
 
-#: rapid/copyfiles.py:143 rapid/subfolderfile.py:209
-#: rapid/subfolderfile.py:348 rapid/subfolderfile.py:366
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
 "%(problem)s\n"
 "File: %(file)s"
 msgstr ""
 
-#: rapid/device.py:79
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr ""
+
+#: rapid/device.py:80
 msgid "Device Detected"
 msgstr ""
 
 #. 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 ""
 
-#: rapid/downloadtracker.py:268
+#: rapid/downloadtracker.py:299
 msgid "MB/s"
 msgstr ""
 
-#: rapid/generatenameconfig.py:143
+#: rapid/generatenameconfig.py:151
 msgid "Date time"
 msgstr ""
 
-#: rapid/generatenameconfig.py:144
+#: rapid/generatenameconfig.py:152
 msgid "Text"
 msgstr "Teks"
 
-#: rapid/generatenameconfig.py:145
+#: rapid/generatenameconfig.py:153
 msgid "Filename"
 msgstr "Nama Berkas"
 
-#: rapid/generatenameconfig.py:146
+#: rapid/generatenameconfig.py:154
 msgid "Metadata"
 msgstr "Metadata"
 
-#: rapid/generatenameconfig.py:147
+#: rapid/generatenameconfig.py:155
 msgid "Sequences"
 msgstr "Urutan"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/generatenameconfig.py:149 rapid/preferencesdialog.py:549
+#: rapid/generatenameconfig.py:157 rapid/preferencesdialog.py:577
 msgid "Job code"
 msgstr ""
 
-#: rapid/generatenameconfig.py:150
+#: rapid/generatenameconfig.py:158
 msgid "Image date"
 msgstr "Tanggal gambar"
 
-#: rapid/generatenameconfig.py:151
+#: rapid/generatenameconfig.py:159
 msgid "Video date"
 msgstr "Tanggal video"
 
-#: rapid/generatenameconfig.py:152
+#: rapid/generatenameconfig.py:160
 msgid "Today"
 msgstr "Hari ini"
 
-#: rapid/generatenameconfig.py:153
+#: rapid/generatenameconfig.py:161
 msgid "Yesterday"
 msgstr "Kemarin"
 
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/generatenameconfig.py:155
+#: rapid/generatenameconfig.py:163
 msgid "Download time"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:157
+#: rapid/generatenameconfig.py:165
 msgid "Name + extension"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:159
+#: rapid/generatenameconfig.py:167
 msgid "Name"
 msgstr "Nama"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:161
+#: rapid/generatenameconfig.py:169
 msgid "Extension"
 msgstr "Ekstensi"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:163
+#: rapid/generatenameconfig.py:171
 msgid "Image number"
 msgstr "Jumlah gambar"
 
-#: rapid/generatenameconfig.py:164
+#: rapid/generatenameconfig.py:172
 msgid "Video number"
 msgstr "Jumlah video"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:166
+#: rapid/generatenameconfig.py:174
 msgid "Aperture"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:168
+#: rapid/generatenameconfig.py: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:170
+#: rapid/generatenameconfig.py:178
 msgid "Exposure time"
 msgstr "Waktu pencahayaan"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:172
+#: rapid/generatenameconfig.py:180
 msgid "Focal length"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:174
+#: rapid/generatenameconfig.py: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:176
+#: rapid/generatenameconfig.py:184
 msgid "Camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:178
+#: rapid/generatenameconfig.py: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:180
+#: 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:182
+#: rapid/generatenameconfig.py:190
 msgid "Serial number"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:184
+#: rapid/generatenameconfig.py:192
 msgid "Shutter count"
 msgstr ""
 
+#. File number currently refers to the Exif value Exif.Canon.FileNumber
+#: rapid/generatenameconfig.py:194
+msgid "File number"
+msgstr ""
+
+#. Only the folder component of the Exif.Canon.FileNumber value
+#: rapid/generatenameconfig.py:196
+msgid "Folder only"
+msgstr ""
+
+#. The folder and file component of the Exif.Canon.FileNumber value
+#: rapid/generatenameconfig.py:198
+msgid "Folder and file"
+msgstr ""
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:186
+#: rapid/generatenameconfig.py:200
 msgid "Owner name"
 msgstr ""
 
-#: rapid/generatenameconfig.py:187
+#: rapid/generatenameconfig.py:201
 msgid "Codec"
 msgstr ""
 
-#: rapid/generatenameconfig.py:188
+#: rapid/generatenameconfig.py:202
 msgid "Width"
 msgstr ""
 
-#: rapid/generatenameconfig.py:189
+#: rapid/generatenameconfig.py:203
 msgid "Height"
 msgstr ""
 
-#: rapid/generatenameconfig.py:190
+#: rapid/generatenameconfig.py:204
 msgid "Length"
 msgstr ""
 
-#: rapid/generatenameconfig.py:191
+#: rapid/generatenameconfig.py:205
 msgid "Frames Per Second"
 msgstr ""
 
+#: rapid/generatenameconfig.py:206
+msgid "Artist"
+msgstr ""
+
+#: 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:193
+#: 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:195
+#: 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:197
+#: 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:199
+#: 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:201
+#: 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:203
+#: 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:205
+#: 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:207
+#: 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:209
+#: 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:211
+#: 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:213
+#: 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:215
+#: 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:217
+#: rapid/generatenameconfig.py:233
 msgid "lowercase"
 msgstr ""
 
-#: rapid/generatenameconfig.py:218
+#: rapid/generatenameconfig.py:234
 msgid "One digit"
 msgstr ""
 
-#: rapid/generatenameconfig.py:219
+#: rapid/generatenameconfig.py:235
 msgid "Two digits"
 msgstr ""
 
-#: rapid/generatenameconfig.py:220
+#: rapid/generatenameconfig.py:236
 msgid "Three digits"
 msgstr ""
 
-#: rapid/generatenameconfig.py:221
+#: rapid/generatenameconfig.py:237
 msgid "Four digits"
 msgstr ""
 
-#: rapid/generatenameconfig.py:222
+#: rapid/generatenameconfig.py:238
 msgid "Five digits"
 msgstr ""
 
-#: rapid/generatenameconfig.py:223
+#: rapid/generatenameconfig.py:239
 msgid "Six digits"
 msgstr ""
 
-#: rapid/generatenameconfig.py:224
+#: 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:226
+#: 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:228
+#: 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:230
+#: 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:232
+#: 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:234
+#: 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:236
+#: 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:238
+#: 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:240
+#: 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:242
+#: 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:244
+#: 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:246
+#: 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:248
+#: 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:250
+#: 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:252
+#: 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:254
+#: 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:256
+#: 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:258
+#: 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:260
+#: 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:262
+#: 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:264
+#: 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:266
+#: rapid/generatenameconfig.py:286
 msgid "SS"
 msgstr ""
 
-#: rapid/preferencesdialog.py:370
+#: rapid/preferencesdialog.py:374
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: rapid/preferencesdialog.py:372
+#: rapid/preferencesdialog.py:376
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: rapid/preferencesdialog.py:376
+#: rapid/preferencesdialog.py:380
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#: rapid/preferencesdialog.py:389 rapid/preferencesdialog.py:672
+#: rapid/preferencesdialog.py:439 rapid/preferencesdialog.py:700
 msgid "Remove all Job Codes?"
 msgstr ""
 
-#: rapid/preferencesdialog.py:406 rapid/preferencesdialog.py:689
+#: rapid/preferencesdialog.py:440 rapid/preferencesdialog.py:717
 msgid "Should all Job Codes be removed?"
 msgstr ""
 
-#: rapid/preferencesdialog.py:436
+#: rapid/preferencesdialog.py:446
+msgid "Remove all Remembered Paths?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:447
+msgid "Should all remembered paths be removed?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:453
+msgid "Remove all Ignored Paths?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:454
+msgid "Should all ignored paths be removed?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:465
 msgid "Error in Photo Rename preferences"
 msgstr ""
 
-#: rapid/preferencesdialog.py:617
+#: rapid/preferencesdialog.py:645
 msgid "Error in Video Rename preferences"
 msgstr ""
 
-#: rapid/preferencesdialog.py:638
+#: rapid/preferencesdialog.py:666
 msgid "Error in Photo Download Subfolders preferences"
 msgstr ""
 
-#: rapid/preferencesdialog.py:655
+#: 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:714
+#: 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:731
+#: 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:734
+#: rapid/preferencesdialog.py:761
 msgid "Enter a new Job Code"
 msgstr ""
 
-#: rapid/preferencesdialog.py:739
+#: rapid/preferencesdialog.py:766
 msgid "Job Code:"
 msgstr ""
 
-#: rapid/preferencesdialog.py:916
-msgid "Job Code"
+#: rapid/preferencesdialog.py:822
+msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: rapid/preferencesdialog.py:998
-msgid "Select a folder to download photos to"
+#: rapid/preferencesdialog.py:834
+msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1016
-msgid "Select a folder to download videos to"
+#: rapid/preferencesdialog.py:839
+msgid "Path:"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1107
-#, python-format
-msgid "Select a folder containing %(file_types)s"
+#: rapid/preferencesdialog.py:1092
+msgid "Job Code"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1129
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
+#: rapid/preferencesdialog.py:1363
+msgid "Select a folder in which to backup photos"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1376
+msgid "Select a folder in which to backup videos"
 msgstr ""
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/preferencesdialog.py:1215
+#: rapid/preferencesdialog.py:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1266
+#: rapid/preferencesdialog.py:1524
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/preferencesdialog.py:1269
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr ""
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1359
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -851,393 +1003,440 @@ msgid ""
 "They will be reset to their default values."
 msgstr ""
 
+#: rapid/preferencesdialog.py:1762
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1764
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1765
+msgid "Invalid regular expression"
+msgstr ""
+
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1645
+#: rapid/preferencesdialog.py:1949
 msgid "externaldrive1"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1647
+#: rapid/preferencesdialog.py:1951
 msgid "externaldrive2"
 msgstr ""
 
-#: rapid/prefsrapid.py:122
+#: rapid/prefsrapid.py:127
 msgid "New York"
 msgstr ""
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:128
 msgid "Manila"
 msgstr ""
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:128
 msgid "Prague"
 msgstr ""
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:128
 msgid "Helsinki"
 msgstr ""
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:128
 msgid "Wellington"
 msgstr ""
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:129
 msgid "Tehran"
 msgstr ""
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:129
 msgid "Kampala"
 msgstr ""
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:129
 msgid "Paris"
 msgstr ""
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:129
 msgid "Berlin"
 msgstr ""
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:129
 msgid "Sydney"
 msgstr ""
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:130
 msgid "Budapest"
 msgstr ""
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:130
 msgid "Rome"
 msgstr ""
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:130
 msgid "Moscow"
 msgstr ""
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:130
 msgid "Delhi"
 msgstr ""
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:130
 msgid "Warsaw"
 msgstr ""
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:131
 msgid "Jakarta"
 msgstr ""
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:131
 msgid "Madrid"
 msgstr ""
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:131
 msgid "Stockholm"
 msgstr ""
 
 #. components
-#: rapid/problemnotification.py:26 rapid/subfolderfile.py:359
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
 msgstr ""
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:357
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr ""
 
-#: rapid/problemnotification.py:80
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr ""
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:86
 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:88
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr ""
 
 #. a generic problem
-#: rapid/problemnotification.py:86
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr ""
 
-#: rapid/problemnotification.py:88
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr ""
 
-#: rapid/problemnotification.py:90 rapid/problemnotification.py:91
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr ""
 
-#: rapid/problemnotification.py:93 rapid/problemnotification.py:94
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr ""
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr ""
 
-#: rapid/problemnotification.py:97
+#: rapid/problemnotification.py:105
 #, 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:110
 #, python-format
 msgid ""
-"%(image1)s was taken at on %(image1_date)s at %(image1_time)s, and "
-"%(image2)s on %(image2_date)s at %(image2_time)s."
+"%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
+"on %(image2_date)s at %(image2_time)s."
 msgstr ""
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr ""
 
-#: rapid/problemnotification.py:107
+#: rapid/problemnotification.py:115
 #, 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:116
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:117
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr ""
 
-#: rapid/problemnotification.py:111
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr ""
 
-#: rapid/problemnotification.py:201
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr ""
 
-#: rapid/problemnotification.py:204
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
 msgstr ""
 
-#: rapid/problemnotification.py:223
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr ""
 
-#: rapid/problemnotification.py:225
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr ""
 
-#: rapid/problemnotification.py:227 rapid/problemnotification.py:288
-#: rapid/problemnotification.py:300
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr ""
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:240
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
 "%(details)s"
 msgstr ""
 
-#: rapid/problemnotification.py:257
+#: rapid/problemnotification.py:269
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr ""
 
-#: rapid/problemnotification.py:259
+#: rapid/problemnotification.py:271
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:261
+#: rapid/problemnotification.py:273
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr ""
 
-#: rapid/problemnotification.py:265 rapid/problemnotification.py:313
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr ""
 
-#: rapid/problemnotification.py:267
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr ""
 
-#: rapid/problemnotification.py:271 rapid/problemnotification.py:315
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr ""
 
-#: rapid/problemnotification.py:276
+#: rapid/problemnotification.py:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:284
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:286
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr ""
 
-#: rapid/problemnotification.py:296
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:298
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr ""
 
-#: rapid/problemnotification.py:309
+#: rapid/problemnotification.py:321
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr ""
 
-#: rapid/problemnotification.py:311
+#: rapid/problemnotification.py:323
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 
-#: rapid/problemnotification.py:322
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr ""
 
-#: rapid/problemnotification.py:330
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr ""
 
-#: rapid/problemnotification.py:332
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr ""
 
-#: rapid/problemnotification.py:341
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: rapid/problemnotification.py:343
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr ""
 
-#: rapid/problemnotification.py:346
+#: rapid/problemnotification.py:371
 #, python-format
 msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr ""
 
-#: rapid/problemnotification.py:363
+#: rapid/problemnotification.py:388
 msgid "Problems in subfolder and filename generation"
 msgstr ""
 
-#: rapid/problemnotification.py:365
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr ""
 
-#: rapid/problemnotification.py:368
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr ""
 
-#: rapid/problemnotification.py:370
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr ""
 
-#: rapid/problemnotification.py:379
+#: rapid/problemnotification.py:404
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr ""
 
-#: rapid/problemnotification.py:381
+#: rapid/problemnotification.py:406
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 
-#: rapid/problemnotification.py:401
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr ""
 
-#: rapid/problemnotification.py:403 rapid/subfolderfile.py:228
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 
-#: rapid/problemnotification.py:409
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr ""
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr ""
 
-#: rapid/problemnotification.py:412
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr ""
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr ""
 
 #. e.g.
-#: rapid/problemnotification.py:416
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr ""
 
-#: rapid/rpdfile.py:136
+#: rapid/rpdfile.py:159
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#: rapid/subfolderfile.py:79
+#: rapid/rpdfile.py:169
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
+msgstr ""
+
+#: rapid/subfolderfile.py:81
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr ""
 
-#: rapid/subfolderfile.py:297
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr ""
+
+#: rapid/subfolderfile.py:406
 msgid "Photo has already been downloaded"
 msgstr ""
 
-#: rapid/subfolderfile.py:298
+#: rapid/subfolderfile.py:407
 #, python-format
 msgid "Source: %(source)s"
 msgstr ""
 
-#: rapid/subfolderfile.py:355
-msgid "subfolder and filename"
-msgstr ""
-
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:485
 msgid "Failed to create download subfolder"
 msgstr ""
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:486
 #, python-format
 msgid "Path: %s"
 msgstr ""
@@ -1247,7 +1446,7 @@ msgid "About..."
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:2
-msgid "Check All"
+msgid "_Check All"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:3
@@ -1258,12 +1457,12 @@ msgstr ""
 msgid "Check All Videos"
 msgstr ""
 
-#: rapid/glade3/rapid.ui.h:6
-msgid "Download / Pause"
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:7
-msgid "Get Help Online..."
+msgid "_Get Help Online..."
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:8
@@ -1271,67 +1470,67 @@ msgid "Help"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:9
-msgid "Make a Donation..."
+msgid "Preferences"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:10
-msgid "Next File"
+msgid "Quit"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:11
-msgid "Preferences"
+msgid "Refresh"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:12
-msgid "Previous File"
+msgid "_Report a Problem..."
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:13
-msgid "Quit"
+msgid "Translate this Application..."
 msgstr ""
 
-#: rapid/glade3/rapid.ui.h:15
-msgid "Refresh"
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:16
-msgid "Report a Problem..."
+msgid "_File"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:17
-msgid "Select All Wit_h Job Code"
+msgid "Download / Pause"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:18
-msgid "Select All Without _Job Code"
+msgid "_Select"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:19
-msgid "Translate this Application..."
+msgid "Select All Without _Job Code"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:20
-msgid "Uncheck All"
+msgid "Select All Wit_h Job Code"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:21
-msgid "_Check All"
+msgid "_View"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:22
-msgid "_Clear Completed Downloads"
+msgid "_Error Log"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:23
-msgid "_Download"
+msgid "_Clear Completed Downloads"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:24
-msgid "_Error Log"
+msgid "Previous File"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:25
-msgid "_File"
+msgid "Next File"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:26
@@ -1339,51 +1538,41 @@ msgid "_Help"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:27
-msgid "_Include in download"
+msgid "_Translate this Application..."
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:28
-msgid "_Make a Donation..."
+msgid "_Include in download"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:29
-msgid "_Select"
-msgstr ""
-
-#: rapid/glade3/rapid.ui.h:30
-msgid "_Translate this Application..."
-msgstr ""
-
-#: rapid/glade3/rapid.ui.h:31
-msgid "_Uncheck All"
-msgstr ""
-
-#: rapid/glade3/rapid.ui.h:32
-msgid "_View"
+msgid "_Download"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:1
-msgid " "
+msgid "Preferences: Rapid Photo Downloader"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:2
-msgid " hh:mm"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:3
-msgid ":"
+msgid "<i>Example: /home/user/Pictures</i>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:4
-msgid "<b>Backup</b>"
+msgid "<b>Download Subfolders</b>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:5
-msgid "<b>Compatibility with Other Operating Systems</b>"
+msgid "Download folder:"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:6
-msgid "<b>Devices</b>"
+msgid ""
+"Choose the download folder. Subfolders for the downloaded photos will be "
+"automatically created in this folder using the structure specified below."
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:7
@@ -1391,260 +1580,258 @@ msgid "<b>Download Folder</b>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:8
-msgid "<b>Download Subfolders</b>"
+msgid "Photo Folders"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:9
-msgid "<b>Example</b>"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:10
-msgid "<b>Job Codes</b>"
+msgid "<b>Photo Rename</b>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:11
-msgid "<b>Photo Rename</b>"
+msgid " "
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:12
-msgid "<b>Photo and Video Name Conflicts</b>"
+msgid "<i>New:</i>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:13
-msgid "<b>Program Automation</b>"
+msgid "<i>Original:</i>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:14
-msgid "<b>Sequence Numbers</b>"
+msgid "<b>Example</b>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:15
-msgid "<i>/media/externaldrive/Photos</i>"
+msgid "Photo Rename"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:16
-msgid "<i>Example: /home/user/Pictures</i>"
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:17
-msgid "<i>Example:</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 ""
 
 #: rapid/glade3/prefs.ui.h:18
-msgid "<i>New:</i>"
+msgid ""
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:19
-msgid "<i>Original:</i>"
+msgid "Video Folders"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:20
-msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:21
-msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgid "Video Rename"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:22
-msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:23
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgid "<b>Sequence Numbers</b>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
+msgid ""
+"Specify the time in 24 hour format at which the <i>Downloads today</i> "
+"sequence number should be reset."
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:25
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+msgid "Day start:"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgid "Downloads today:"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
+msgid "Stored number:"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgid ":"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:29
-msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgid " hh:mm"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:30
-msgid "Add unique identifier"
+msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:31
-msgid "Automatically detect Portable Storage Devices"
+msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:32
-msgid "Automatically detect backup devices"
+msgid ""
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:33
-msgid "Automatically detect devices"
+msgid "Strip incompatible characters"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:34
-msgid "Backup"
+msgid "Rename Options"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup location:"
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:36
-msgid "Backup photos and videos when downloading"
+msgid "<b>Job Codes</b>"
 msgstr ""
 
 #: 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 ""
-
-#: 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."
+msgid "_Add..."
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:39
-msgid "Day start:"
+msgid "R_emove All"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:40
-msgid "Delete photos and videos from device upon download completion"
+msgid "Job Codes"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:41
-msgid "Devices"
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:42
+msgid "Devices"
+msgstr ""
+
+#: 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"
 "\n"
-"You can download photos from multiple devices simultaneously, or you can "
-"specify a location on your hard drive.\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\n"
 "\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
-msgstr ""
-
-#: rapid/glade3/prefs.ui.h:47
-msgid "Download folder:"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:48
-msgid "Downloads today:"
+msgid "Automatically detect Portable Storage Devices"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:49
-msgid "Error Handling"
+msgid "Automatically detect devices"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:50
-msgid "Exit program even if download had warnings or errors"
-msgstr ""
-
-#: rapid/glade3/prefs.ui.h:51
-msgid "Exit program when download completes"
-msgstr ""
-
-#: rapid/glade3/prefs.ui.h:52
-msgid "Generate thumbnails (slower)"
+msgid ""
+"If you enable automatic detection of Portable Storage Devices, the entire "
+"device will be scanned. On large devices, this could take some time.\n"
+"\n"
+"When this option is enabled, and a potential device is detected, you will be "
+"prompted to determine if it should be scanned or not."
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:53
-msgid "If you disable automatic detection, choose the exact backup location."
+msgid "Location:"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:54
 msgid ""
-"If you disable automatic detection, choose the exact location of the images "
+"If you disable automatic detection, choose the exact location of the photos "
 "and videos."
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:55
-msgid ""
-"If you enable automatic detection of Portable Storage Devices, the entire "
-"device will be scanned for images. On large devices, this could take some "
-"time."
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:56
-msgid "Job Codes"
+msgid "Remembered Paths"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:57
-msgid "Location:"
+msgid ""
+"Remembered paths are those associated with devices that you have chosen to "
+"always scan or ignore when automatic detection of Portable Storage Devices "
+"is enabled."
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:58
-msgid "Miscellaneous"
+msgid "Ignored Paths"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:59
-msgid "Overwrite"
-msgstr ""
-
-#: rapid/glade3/prefs.ui.h:60
-msgid "Performance"
+msgid ""
+"Specify the ending portion of any paths you want ignored when scanning "
+"devices for photos or videos. Any path ending with the values below will not "
+"be scanned."
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:61
-msgid "Photo Folders"
+msgid "Re_move All"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:62
-msgid "Photo Rename"
+msgid "Use _python-style regular expressions"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:63
-msgid "Photo backup folder name:"
+msgid "Device Options"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:64
-msgid "Preferences: Rapid Photo Downloader"
+msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:65
+msgid "<b>Backup</b>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:66
-msgid "R_emove All"
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:67
-msgid "Rename Options"
+msgid "Automatically detect backup devices"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:68
-msgid "Skip"
+msgid ""
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:69
-msgid "Skip download"
+msgid "Back up photos and videos when downloading"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:70
 msgid ""
-"Sorry, video downloading functionality disabled. To download videos, please "
-"install the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for "
-"python."
-msgstr ""
-
-#: rapid/glade3/prefs.ui.h:71
-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 "
@@ -1652,74 +1839,120 @@ msgid ""
 "a folder in it with one of these names.</i>"
 msgstr ""
 
+#: rapid/glade3/prefs.ui.h:73
+msgid "Photo backup location:"
+msgstr ""
+
 #: rapid/glade3/prefs.ui.h:74
-msgid ""
-"Specify the time in 24 hour format at which the <i>Downloads today</i> "
-"sequence number should be reset."
+msgid "Photo backup folder name:"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:75
-msgid ""
-"Specify whether photo, video and folder names should have any characters "
-"removed that are not allowed by other operating systems."
+msgid "<i>Example:</i>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:76
-msgid "Start downloading at program startup"
+msgid "<i>/media/externaldrive/Photos</i>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:77
-msgid "Start downloading upon device insertion"
+msgid "Video backup folder name:"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:78
-msgid "Stored number:"
+msgid "Video backup location:"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:79
-msgid "Strip incompatible characters"
+msgid "Back up"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:80
-msgid "Synchronize RAW + JPEG sequence numbers"
+msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:81
-msgid "Unmount (\"eject\") device upon download completion"
+msgid "<b>Program Automation</b>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:82
-msgid "Video Folders"
+msgid "Unmount (\"eject\") device upon download completion"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:83
-msgid "Video Rename"
+msgid "Start downloading at program startup"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:84
-msgid "Video backup folder name:"
+msgid "Start downloading upon device insertion"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:85
+msgid "Exit program when download completes"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:86
+msgid "Exit program even if download had warnings or errors"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:87
+msgid "Automatically rotate JPEG images"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:90
+msgid "Performance"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:91
+msgid "Generate thumbnails (slower)"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:92
+msgid "Miscellaneous"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:93
+msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:94
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:95
+msgid "Add unique identifier"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:96
+msgid "Skip download"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:97
 msgid ""
 "When a photo or video of the same name has already been downloaded, choose "
 "whether to skip downloading the file, or to add a unique indentifier."
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:87
-msgid ""
-"You can have your photos and videos backed up to multiple locations as they "
-"are downloaded, e.g. external hard drives."
+#: rapid/glade3/prefs.ui.h:99
+msgid "Overwrite"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:88
-msgid "_Add..."
+#: rapid/glade3/prefs.ui.h:100
+msgid "Skip"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:101
+msgid "Error Handling"
 msgstr ""
 
 #: rapid/glade3/about.ui.h:1
diff --git a/po/it.po b/po/it.po
index 1359a9c..9d98c36 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: 2012-06-23 04:00-0500\n"
-"PO-Revision-Date: 2012-09-30 14:30+0000\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-21 23:51+0000\n"
 "Last-Translator: Milo Casagrande <milo.casagrande@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: 2012-11-26 19:04+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:119
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:122
+#: rapid/rapid.py:127
 #, 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:157
+#: rapid/rapid.py:162
 msgid "Device"
 msgstr "Dispositivo"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:175
+#: rapid/rapid.py:180
 msgid "Size"
 msgstr "Dimensione"
 
-#: rapid/rapid.py:178
+#: rapid/rapid.py:183
 msgid "Download Progress"
 msgstr "Avanzamento scaricamento"
 
-#: rapid/rapid.py:336
+#: rapid/rapid.py:343
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s non è stato smontato correttamente"
@@ -66,38 +66,38 @@ msgstr "%(device)s non è stato 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:1216
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr "Analisi..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1782
+#: rapid/rapid.py:1818
 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:1786
+#: rapid/rapid.py:1822
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Scaricamento da %(location)s."
 
-#: rapid/rapid.py:1787
+#: rapid/rapid.py:1823
 msgid ""
 "Do you really want to download from here? On some systems, scanning this "
 "location can take a very long time."
 msgstr ""
-"Si vuole davvero scaricare da qui? Su alcuni sistemi esaminare questa "
-"posizione può richiedere un tempo molto lungo"
+"Scaricare veramente da questa posizione? Su alcuni sistemi, l'analisi di "
+"questa posizione può richiedere molto tempo."
 
-#: rapid/rapid.py:2209
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr "Scarica"
 
-#: rapid/rapid.py:2212
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr "Sospendi"
 
-#: rapid/rapid.py:2317
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -108,7 +108,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2320
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -117,176 +117,189 @@ msgstr ""
 "La seguente cartella da scaricare non è valida:\n"
 "%s"
 
-#: rapid/rapid.py:2321
+#: rapid/rapid.py:2380
 msgid "Download cannot proceed"
-msgstr "Il download non può procedere"
+msgstr "Impossibile procedere con lo scaricamento"
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+"Nessun dispositivo di backup contiene una cartella valida per eseguire il "
+"backup di %(filetype)s"
 
-#: rapid/rapid.py:2700
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "foto"
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "video"
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr "Problema nel backup"
+
+#: rapid/rapid.py:2802
 msgid "About 1 second remaining"
-msgstr "Circa 1 secondo rimanente"
+msgstr "Manca circa 1 secondo"
 
-#: rapid/rapid.py:2702
+#: rapid/rapid.py:2804
 #, python-format
 msgid "About %i seconds remaining"
-msgstr "Circa %i secondi rimanenti"
+msgstr "Mancano circa %i secondi"
 
-#: rapid/rapid.py:2704
+#: rapid/rapid.py:2806
 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:2709
+#: rapid/rapid.py:2811
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
-msgstr "Circa %(minutes)i.%(seconds)02i minuti rimanenti"
+msgstr "Mancano circa %(minutes)i.%(seconds)02i minuti"
 
-#: rapid/rapid.py:2731 rapid/rpdfile.py:123
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
 msgid "photos and videos"
 msgstr "foto e video"
 
-#: rapid/rapid.py:2733 rapid/rpdfile.py:125
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
 msgid "photos or videos"
 msgstr "foto o video"
 
-#: rapid/rapid.py:2736 rapid/rapid.py:3558 rapid/rpdfile.py:128
-msgid "videos"
-msgstr "video"
-
-#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
-#: rapid/rpdfile.py:291
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
 msgid "video"
 msgstr "video"
 
-#: 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:2743 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
-#: rapid/rpdfile.py:272
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
 msgid "photo"
-msgstr "photo"
+msgstr "foto"
 
-#: rapid/rapid.py:2770
+#: rapid/rapid.py:2872
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
-msgstr "%(noFiles)s %(filetypes)s scaricati"
+msgstr "Scaricati %(noFiles)s %(filetypes)s"
 
-#: rapid/rapid.py:2774
+#: rapid/rapid.py:2876
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "Impossibile scaricare %(noFiles)s %(filetypes)s"
 
-#: rapid/rapid.py:2777 rapid/rapid.py:2829
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
 msgid "warnings"
-msgstr "avvertenze"
+msgstr "avvisi"
 
-#: rapid/rapid.py:2786
+#: rapid/rapid.py:2892
 msgid "All downloads complete"
-msgstr "Tutti i download completati"
+msgstr "Scaricamenti completati"
 
-#: rapid/rapid.py:2792 rapid/rapid.py:2801 rapid/rapid.py:2810
-#: rapid/rapid.py:2819 rapid/rapid.py:2827
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2794 rapid/rapid.py:2812
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s scaricati"
 
-#: rapid/rapid.py:2803 rapid/rapid.py:2821
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, 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:2860
+#: rapid/rapid.py:2970
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
-msgstr "%(number)s di %(total)s %(filetypes)s (%(remaining)s rimanenti)"
+msgstr "%(number)s su %(total)s %(filetypes)s (%(remaining)s rimanenti)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:2977
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
-msgstr "%(number)s di %(total)s %(filetypes)s"
+msgstr "%(number)s su %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3222
+#: rapid/rapid.py:3331
 msgid "From"
 msgstr "Da"
 
-#: rapid/rapid.py:3230
+#: rapid/rapid.py:3339
 msgid "Auto Detect"
 msgstr "Rileva automaticamente"
 
-#: rapid/rapid.py:3234 rapid/preferencesdialog.py:1327
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Selezionare una cartella contenente %(file_types)s"
 
-#: rapid/rapid.py:3275
+#: rapid/rapid.py:3384
 msgid "Copy"
 msgstr "Copia"
 
-#: rapid/rapid.py:3288
+#: rapid/rapid.py:3397
 msgid "Move"
 msgstr "Sposta"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3419
 msgid "To"
-msgstr "A"
+msgstr "Su"
 
-#: rapid/rapid.py:3317 rapid/rapid.py:3986
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
 msgid "Photos:"
 msgstr "Foto:"
 
-#: rapid/rapid.py:3320 rapid/preferencesdialog.py:1164
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
 msgid "Select a folder to download photos to"
 msgstr "Selezionare una cartella in cui scaricare le foto"
 
-#: rapid/rapid.py:3332 rapid/rapid.py:3986
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
 msgid "Videos:"
 msgstr "Video:"
 
-#: rapid/rapid.py:3334 rapid/preferencesdialog.py:1182
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
 msgid "Select a folder to download videos to"
 msgstr "Selezionare una cartella in cui scaricare i video"
 
-#: rapid/rapid.py:3526
+#: rapid/rapid.py:3650
 msgid "and"
 msgstr "e"
 
-#: rapid/rapid.py:3531
+#: rapid/rapid.py:3655
 msgid "Using backup devices"
 msgstr "Si utilizzano dispositivi di backup"
 
-#: rapid/rapid.py:3533
+#: rapid/rapid.py:3657
 msgid "Using backup device"
 msgstr "Si utilizza un dispositivo di backup"
 
-#: rapid/rapid.py:3535
+#: rapid/rapid.py:3659
 msgid "No backup devices detected"
-msgstr "Non è stato rilevato nessun dispositivo di backup"
+msgstr "Non è stato rilevato alcun dispositivo di backup"
 
-#: rapid/rapid.py:3562
+#: rapid/rapid.py:3686
 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:3574
+#: rapid/rapid.py:3698
 #, 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:3578
+#: rapid/rapid.py:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -294,158 +307,160 @@ 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:3583
+#: rapid/rapid.py:3707
 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:3588
+#: rapid/rapid.py:3712
 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:3594
+#: rapid/rapid.py:3718
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s liberi"
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3602
+#: rapid/rapid.py:3726
 #, python-format
 msgid "Backing up photos and videos to %(path)s"
-msgstr "Si salvano fotografie e video in %(path)s"
+msgstr "Backup di fotografie e video su %(path)s"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3605
+#: rapid/rapid.py:3729
 #, 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:3608
+#: rapid/rapid.py:3732
 #, 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"
+msgstr "Backup delle fotografie su %(path)s, dei video su %(path2)s"
 
-#: rapid/rapid.py:3615
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3644
+#: rapid/rapid.py:3768
 msgid "Program preferences are invalid"
 msgstr "Le preferenze del programma non sono valide"
 
-#: rapid/rapid.py:3770 rapid/rpdfile.py:273
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
 msgid "Photo"
 msgstr "Foto"
 
-#: rapid/rapid.py:3772 rapid/rpdfile.py:292
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:3781
+#: rapid/rapid.py:3921
 #, python-format
 msgid "%(file_type)s download folder does not exist"
-msgstr "la cartella di download %(file_type)s non esiste"
+msgstr "la cartella per scaricare %(file_type)s non esiste"
 
-#: rapid/rapid.py:3783 rapid/rapid.py:3797 rapid/rapid.py:3810
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
 msgid "Folder: %s"
 msgstr "Cartella: %s"
 
-#: rapid/rapid.py:3795
+#: rapid/rapid.py:3935
 #, python-format
 msgid "%(file_type)s download folder is invalid"
-msgstr "la cartella di download %(file_type)s non è valida"
+msgstr "la cartella per scaricare %(file_type)s non è valida"
 
-#: rapid/rapid.py:3808
+#: rapid/rapid.py:3948
 #, python-format
 msgid "%(file_type)s download folder is not writable"
-msgstr "la cartella di download %(file_type)s non è scrivibile"
+msgstr "la cartella per scaricare %(file_type)s non è scrivibile"
 
-#: rapid/rapid.py:3894
+#: rapid/rapid.py:4034
 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:3949
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
 "(default: %default)"
 msgstr ""
-"visualizza informazioni sul programma sulla riga comando quando il programma "
-"è in esecuzione (default: %default)"
+"Visualizza informazioni sulla riga comando quando il programma è in "
+"esecuzione (predefinito: %default)"
 
-#: rapid/rapid.py:3950
+#: rapid/rapid.py:4090
 msgid "display debugging information when run from the command line"
-msgstr "visualizza informazioni di debug quando eseguito dalla riga comando"
+msgstr "Visualizza informazioni di debug quando eseguito dalla riga comando"
 
-#: rapid/rapid.py:3951
+#: rapid/rapid.py:4091
 msgid "only output errors to the command line"
-msgstr "visualizza solo gli errori sulla riga comando"
+msgstr "Visualizza solo gli errori sulla riga comando"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3953
+#: rapid/rapid.py:4093
 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 "
+"Elenca le estensioni delle foto e dei video riconosciuti dal programma ed "
 "esce"
 
-#: rapid/rapid.py:3955
+#: rapid/rapid.py:4095
 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"
+"Rileva automaticamente i dispositivi da cui scaricare, sovrascrivendo le "
+"preferenze esistenti del programma"
 
-#: rapid/rapid.py:3956
+#: rapid/rapid.py:4096
 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"
+"Specifica manualmente il PATH del dispositivo da cui scaricare, "
+"sovrascrivendo le preferenze esistenti del programma"
 
-#: rapid/rapid.py:3957
+#: rapid/rapid.py:4097
 msgid "reset all program settings and preferences and exit"
-msgstr "resetta tutte le impostazioni e preferenze del programma ed esce"
+msgstr ""
+"Reimposta tutte le preferenze e le impostazioni del programma ed esce"
 
-#: rapid/rapid.py:3970
+#: rapid/rapid.py:4110
 msgid ""
 "Error: specify device auto-detection or manually specify a device's path "
 "from which to download, but do not do both."
 msgstr ""
-"Errore: specifica il dispositivo di autorilevamento o specifica manualmente "
-"il percorso di un dispositivo dal quale scaricare, ma non fare entrambe le "
-"cose."
+"Errore: specificare il dispositivo di auto-rilevamento o specificare "
+"manualmente il percorso di un dispositivo dal quale scaricare, ma non "
+"entrambe."
 
-#: rapid/rapid.py:3991
+#: rapid/rapid.py:4133
 #, python-format
 msgid "and %s"
 msgstr "e %s"
 
-#: rapid/rapid.py:3999
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
-msgstr "Tutte le impostazioni e preferenze sono state resettate"
+msgstr "Tutte le impostazioni e preferenze sono state reimpostate"
 
-#: rapid/backupfile.py:157 rapid/backupfile.py:180
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
 msgid "Backing up error"
 msgstr "Errore durante il backup"
 
-#: rapid/backupfile.py:159
+#: rapid/backupfile.py:151
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
-msgstr "Non si è potuto creare la cartella di destinazione: %(directory)s\n"
+msgstr "Impossibile creare la directory di destinazione: %(directory)s\n"
 
-#: rapid/backupfile.py:161 rapid/backupfile.py:182 rapid/subfolderfile.py:199
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -454,13 +469,29 @@ msgstr ""
 "Origine: %(source)s\n"
 "Destinazione: %(destination)s"
 
-#: rapid/backupfile.py:164 rapid/backupfile.py:184
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Errore: %(inst)s"
 
-#: rapid/copyfiles.py:163 rapid/subfolderfile.py:214
-#: rapid/subfolderfile.py:347 rapid/subfolderfile.py:365
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr "Backup %(file_type)s sovrascritto"
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr "Backup di %(file_type)s non eseguito"
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr "Il backup di %(file_type)s esiste già"
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -469,6 +500,10 @@ msgstr ""
 "%(problem)s\n"
 "File: %(file)s"
 
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr "Si è verificato un errore sconosciuto"
+
 #: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Dispositivo rilevato"
@@ -478,13 +513,13 @@ msgstr "Dispositivo rilevato"
 msgid ""
 "Should this device or partition be used to download photos or videos from?"
 msgstr ""
-"Si vuole utilizzare questo dispositivo o partizione come sorgente da cui "
-"scaricare foto o video?"
+"Utilizzare questo dispositivo o partizione come sorgente da cui scaricare "
+"foto o video?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
 #: rapid/device.py:108
 msgid "_Remember this choice"
-msgstr "_Ricorda questa scelta"
+msgstr "_Ricordare questa scelta"
 
 #: rapid/downloadtracker.py:299
 msgid "MB/s"
@@ -504,7 +539,7 @@ msgstr "Nome file"
 
 #: rapid/generatenameconfig.py:154
 msgid "Metadata"
-msgstr "Metadati"
+msgstr "Meta-dati"
 
 #: rapid/generatenameconfig.py:155
 msgid "Sequences"
@@ -534,7 +569,7 @@ msgstr "Ieri"
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
 #: rapid/generatenameconfig.py:163
 msgid "Download time"
-msgstr "Tempo del download"
+msgstr "Tempo di scaricamento"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
 #: rapid/generatenameconfig.py:165
@@ -598,7 +633,7 @@ msgstr "Modello fotocamera breve"
 #. 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 "Modello breve della fotocamera (es.: DSC-P92)"
+msgstr "Modello della fotocamera breve (es.: DSC-P92)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
 #: rapid/generatenameconfig.py:190
@@ -656,12 +691,12 @@ msgstr "Artista"
 
 #: rapid/generatenameconfig.py:207
 msgid "Copyright"
-msgstr "Diritti d'autore"
+msgstr "Copyright"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
 #: rapid/generatenameconfig.py:209
 msgid "Downloads today"
-msgstr "Download oggi"
+msgstr "Scaricati oggi"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
 #: rapid/generatenameconfig.py:211
@@ -671,7 +706,7 @@ msgstr "Numero della sessione"
 #. 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 "Numero della sottocartella"
+msgstr "Numero della sotto-cartella"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
 #: rapid/generatenameconfig.py:215
@@ -769,37 +804,37 @@ msgstr "AAAA-MM-GG"
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/generatenameconfig.py:248
 msgid "YYMMDD"
-msgstr "AAMMDD"
+msgstr "AAMMGG"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/generatenameconfig.py:250
 msgid "YY-MM-DD"
-msgstr "AA-MM-DD"
+msgstr "AA-MM-GG"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/generatenameconfig.py:252
 msgid "MMDDYYYY"
-msgstr "MMDDAAAA"
+msgstr "MMGGAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/generatenameconfig.py:254
 msgid "MMDDYY"
-msgstr "MMDDAA"
+msgstr "MMGGAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/generatenameconfig.py:256
 msgid "MMDD"
-msgstr "MMDD"
+msgstr "MMGG"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/generatenameconfig.py:258
 msgid "DDMMYYYY"
-msgstr "DDMMAAAA"
+msgstr "GGMMAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/generatenameconfig.py:260
 msgid "DDMMYY"
-msgstr "DDMMAA"
+msgstr "GGMMAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/generatenameconfig.py:262
@@ -819,17 +854,17 @@ msgstr "MM"
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/generatenameconfig.py:268
 msgid "DD"
-msgstr "DD"
+msgstr "GG"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/generatenameconfig.py:270
 msgid "Month (full)"
-msgstr "Mese"
+msgstr "Mese (intero)"
 
 #. 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"
+msgstr "Mese (abbreviato)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/generatenameconfig.py:274
@@ -869,30 +904,32 @@ msgstr "SS"
 #: 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"
+msgstr "Le preferenze della sotto-cartella non dovrebbero iniziare con un %s"
 
 #: 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"
+msgstr ""
+"Le preferenze della sotto-cartella non dovrebbero terminare con un %s"
 
 #: 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"
+"Le preferenze della sotto-cartella non dovrebbero contenere due %s uno dopo "
+"l'altro"
 
 #: rapid/preferencesdialog.py:439 rapid/preferencesdialog.py:700
 msgid "Remove all Job Codes?"
-msgstr "Elimina tutti i Codici Lavoro?"
+msgstr "Rimuovere tutti i codici lavoro?"
 
 #: rapid/preferencesdialog.py:440 rapid/preferencesdialog.py:717
 msgid "Should all Job Codes be removed?"
-msgstr "Occorre rimuovere tutti i Codici Lavoro?"
+msgstr "Occorre rimuovere tutti i codici lavoro?"
 
 #: rapid/preferencesdialog.py:446
 msgid "Remove all Remembered Paths?"
-msgstr "Elimina tutti i Percorsi Memorizzati?"
+msgstr "Rimuovere tutti i percorsi memorizzati?"
 
 #: rapid/preferencesdialog.py:447
 msgid "Should all remembered paths be removed?"
@@ -900,7 +937,7 @@ msgstr "Occorre rimuovere tutti i percorsi memorizzati?"
 
 #: rapid/preferencesdialog.py:453
 msgid "Remove all Ignored Paths?"
-msgstr "Si rimuovono tutti i percorsi ignorati?"
+msgstr "Rimuovere tutti i percorsi ignorati?"
 
 #: rapid/preferencesdialog.py:454
 msgid "Should all ignored paths be removed?"
@@ -908,38 +945,38 @@ msgstr "Occorre rimuovere tutti i percorsi ignorati?"
 
 #: rapid/preferencesdialog.py:465
 msgid "Error in Photo Rename preferences"
-msgstr "Errore nelle preferenze di Rinomina Foto"
+msgstr "Errore nelle preferenze di rinomina foto"
 
 #: rapid/preferencesdialog.py:645
 msgid "Error in Video Rename preferences"
-msgstr "Errore nelle preferenze di Rinomina Video"
+msgstr "Errore nelle preferenze di rinomina video"
 
 #: rapid/preferencesdialog.py:666
 msgid "Error in Photo Download Subfolders preferences"
-msgstr "Errore nelle preferenze di Scarica Sottocartelle Foto"
+msgstr "Errore nelle preferenze di scarica sotto-cartelle foto"
 
 #: rapid/preferencesdialog.py:683
 msgid "Error in Video Download Subfolders preferences"
-msgstr "Errore nelle preferenze di Scarica Sottocartelle Video"
+msgstr "Errore nelle preferenze di scarica sotto-cartelle video"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
 #: rapid/preferencesdialog.py:742
 msgid "Enter a Job Code"
-msgstr "Inserire un Codice Lavoro"
+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:758
 msgid "Enter a new Job Code, or select a previous one"
-msgstr "Inserire un nuovo Codice Lavoro, o selezionarne uno precedente"
+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:761
 msgid "Enter a new Job Code"
-msgstr "Inserire un nuovo Codice Lavoro"
+msgstr "Inserire un nuovo codice lavoro"
 
 #: rapid/preferencesdialog.py:766
 msgid "Job Code:"
-msgstr "Codice Lavoro:"
+msgstr "Codice lavoro:"
 
 #: rapid/preferencesdialog.py:822
 msgid "Enter a Path to Ignore"
@@ -955,88 +992,87 @@ msgstr ""
 msgid "Path:"
 msgstr "Percorso:"
 
-#: rapid/preferencesdialog.py:1082
+#: rapid/preferencesdialog.py:1092
 msgid "Job Code"
-msgstr "Codice Lavoro"
+msgstr "Codice lavoro"
 
-#: rapid/preferencesdialog.py:1353
+#: rapid/preferencesdialog.py:1363
 msgid "Select a folder in which to backup photos"
 msgstr "Selezioanre un percorso in cui salvare le fotografie"
 
-#: rapid/preferencesdialog.py:1366
+#: rapid/preferencesdialog.py:1376
 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:1461
+#: rapid/preferencesdialog.py:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
 msgstr ""
-"<i><b>Attenzione:</b> I metadati sono insufficienti per generare "
-"completamente il nome. Si prega di utilizzare altre opzioni per la "
-"rinomina.</i>"
+"<i><b>Attenzione:</b> meta-dati insufficienti per generare completamente il "
+"nome. Utilizzare altre opzioni per la rinomina.</i>"
 
-#: rapid/preferencesdialog.py:1512
+#: rapid/preferencesdialog.py:1524
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
-"<i><b>Attenzione:</b> I metadati sono insufficienti per generare "
-"completamente le sottocartelle. Si prega di utilizzare altre opzioni per "
-"nominare le sottocartelle.</i>"
+"<i><b>Attenzione:</b> meta-dati insufficienti per generare completamente le "
+"sotto-cartelle. Utilizzare altre opzioni per identificare le sotto-"
+"cartelle.</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
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Esempio: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1605
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
 "used.\n"
 "They will be reset to their default values."
 msgstr ""
-"Le preferenze della sottocartella %(filetype)s inserite non sono valide e "
+"Le preferenze della sotto-cartella %(filetype)s inserite non sono valide e "
 "non possono essere utilizzate.\n"
-"Saranno reimpostate ai loro valori di default."
+"Vengono ripristinati i valori predefiniti."
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1762
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
 "you correct them:\n"
 " %s"
 msgstr ""
-"Le espressioni regolari che seguono non sono valide, e saranno rimosse a "
-"meno che non vengano corrette:\n"
+"Le espressioni regolari che seguono non sono valide e saranno rimosse a meno "
+"che non vengano corrette:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1752
+#: rapid/preferencesdialog.py:1764
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
 "it:\n"
 " %s"
 msgstr ""
-"Questa espressione regolare non è valida, e sarà rimossa a meno che non "
-"venga corretta:\n"
+"Questa espressione regolare non è valida e sarà rimossa a meno che non venga "
+"corretta:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1753
+#: rapid/preferencesdialog.py:1765
 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:1934
+#: rapid/preferencesdialog.py:1949
 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:1936
+#: rapid/preferencesdialog.py:1951
 msgid "externaldrive2"
 msgstr "driveesterno1"
 
@@ -1078,7 +1114,7 @@ msgstr "Berlino"
 
 #: rapid/prefsrapid.py:129
 msgid "Sydney"
-msgstr "Sidney"
+msgstr "Sydney"
 
 #: rapid/prefsrapid.py:130
 msgid "Budapest"
@@ -1113,55 +1149,60 @@ msgid "Stockholm"
 msgstr "Stoccolma"
 
 #. components
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:358
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
-msgstr "sottocartella"
+msgstr "sotto-cartella"
 
-#: rapid/problemnotification.py:28 rapid/subfolderfile.py:356
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr "nome del file"
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
-msgstr "Il valore del tempo %s sembra essere non valido"
+msgstr "Il valore della data %s non sembra essere valido"
 
-#: rapid/problemnotification.py:82
+#: rapid/problemnotification.py:86
 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:84
+#: rapid/problemnotification.py:88
 msgid "Filename does not have a number component."
 msgstr "Il nome del file non ha una componente numerica."
 
-#: rapid/problemnotification.py:85
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr "Errore nel generare la componente %s."
 
 #. a generic problem
-#: rapid/problemnotification.py:87
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
-msgstr "i metadati %(filetype)s non sono leggibili"
+msgstr "i meta-dati %(filetype)s non sono leggibili"
 
-#: rapid/problemnotification.py:89
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "%(filetype)s %(area)s non può essere generato"
 
-#: rapid/problemnotification.py:91 rapid/problemnotification.py:92
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, 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:94 rapid/problemnotification.py:95
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr "%(filetype)s non è stato scaricato correttamente"
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "%(filetype)s esiste già"
 
-#: rapid/problemnotification.py:98
+#: rapid/problemnotification.py:105
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1170,7 +1211,7 @@ msgstr ""
 "Non si può effettuare il backup di %(filetype)s in quanto non è stata "
 "travata nessuna posizione adatta."
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:110
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -1179,12 +1220,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:104
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "%(filetype)s è stato già scaricato"
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:115
 #, python-format
 msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
@@ -1193,26 +1234,34 @@ 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:109
+#: rapid/problemnotification.py:116
 #, 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:110
+#: rapid/problemnotification.py:117
 #, 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:112
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Errore: %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:202
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+"Controllo del file non riuscito. La versione scaricata è diversa "
+"dall'originale."
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr "I metadata potrebbero essere corrotti."
 
-#: rapid/problemnotification.py:205
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
@@ -1220,28 +1269,28 @@ msgstr ""
 "Il nome del file, l'estensione e le informazioni Exif indicano che è già "
 "stato scaricato."
 
-#: rapid/problemnotification.py:224
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " È stato effettuato il backup su %(volume)s"
 
-#: rapid/problemnotification.py:226
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr " È stato effettuato il backup su questi di dispositivi: "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:229 rapid/problemnotification.py:290
-#: rapid/problemnotification.py:302
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s e %(final_volume)s."
 
-#: rapid/problemnotification.py:241
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
@@ -1250,269 +1299,322 @@ msgstr ""
 "Sono state rilevato foto con lo stesso nome del file, ma scattate in ore "
 "differenti: %(details)s"
 
-#: rapid/problemnotification.py:258
+#: rapid/problemnotification.py:269
 #, 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:260
+#: rapid/problemnotification.py:271
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr "Si è verificato un errore salvando su %(volume)s."
 
-#: rapid/problemnotification.py:262
+#: rapid/problemnotification.py:273
 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:266 rapid/problemnotification.py:314
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:268
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:272 rapid/problemnotification.py:316
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr "%(volumes)s e %(volume)s (%(inst)s)."
 
-#: rapid/problemnotification.py:277
+#: rapid/problemnotification.py:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s e %(volume)s."
 
-#: rapid/problemnotification.py:285
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "Il backup esiste già su %(volume)s."
 
-#: rapid/problemnotification.py:287
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr "Il backup esiste già in queste posizioni: "
 
-#: rapid/problemnotification.py:297
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "Salvataggio sovrascritto su %(volume)s."
 
-#: rapid/problemnotification.py:299
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr "Salvataggi sovrascritti su questi dispositivi: "
 
-#: rapid/problemnotification.py:310
+#: rapid/problemnotification.py:321
 #, 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:312
+#: rapid/problemnotification.py:323
 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:323
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+"Controllo dei file non riuscito su %(volume)s. La versione nel backup è "
+"diversa da quella scaricata."
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr "Controllo dei file non riuscito sui seguenti dispositivi: "
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "%(previousproblem)s Inoltre, %(newproblem)s"
 
-#: rapid/problemnotification.py:331
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " Inoltre, si è verificato %(problems)s."
 
-#: rapid/problemnotification.py:333
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " Inoltre, si è verificato un %(problem)s."
 
-#: rapid/problemnotification.py:342
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Il %(type)s metadata è mancante."
 
-#: rapid/problemnotification.py:344
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr "I seguenti metadata sono mancanti: "
 
-#: rapid/problemnotification.py:347
+#: rapid/problemnotification.py:371
 #, 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:364
+#: rapid/problemnotification.py:388
 msgid "Problems in subfolder and filename generation"
 msgstr "Problemi nella generazione della sottocartella e del nome del file"
 
-#: rapid/problemnotification.py:366
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr "Problema nella generazione della sottocartella e del nome del file"
 
-#: rapid/problemnotification.py:369
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Problemi nella generazione %s"
 
-#: rapid/problemnotification.py:371
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Problema nella generazione %s"
 
-#: rapid/problemnotification.py:380
+#: rapid/problemnotification.py:404
 #, 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:382
+#: rapid/problemnotification.py:406
 #, 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:402
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr "Si sono verificati molteplici errori"
 
-#: rapid/problemnotification.py:404 rapid/subfolderfile.py:233
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 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:410
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr "si sono verificati errori salvando"
 
-#: rapid/problemnotification.py:411
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr "Si sono verificati errori salvando"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr "si è verificato un errore salvando"
 
-#: rapid/problemnotification.py:414
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr "Si è verificato un errore salvando"
 
 #. e.g.
-#: rapid/problemnotification.py:417
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, e %(backinguperror)s"
 
-#: rapid/rpdfile.py:153
+#: rapid/rpdfile.py:159
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/rpdfile.py:163
+#: rapid/rpdfile.py:169
 #, 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
+#: rapid/subfolderfile.py:81
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr "sottocartella e nome del file"
+
+#: rapid/subfolderfile.py:406
 msgid "Photo has already been downloaded"
 msgstr "La fotografia è stata già scaricata"
 
-#: rapid/subfolderfile.py:302
+#: rapid/subfolderfile.py:407
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Origine: %(source)s"
 
-#: rapid/subfolderfile.py:354
-msgid "subfolder and filename"
-msgstr "sottocartella e nome del file"
-
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:485
 msgid "Failed to create download subfolder"
 msgstr ""
 "Si è verificato un errore nella creazione della sottocartella di download"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:486
 #, python-format
 msgid "Path: %s"
 msgstr "Percorso: %s"
 
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr "Informazioni..."
+
 #: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
+msgstr "Seleziona _tutto"
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr "Controlla fotografie"
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr "Controlla video"
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "_Fai una donazione..."
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr "_Richiedi Aiuto In Linea..."
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr "Aiuto"
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
+msgstr "Esci"
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
+msgstr "Aggiorna"
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr "_Segnala un Problema..."
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
+msgstr "Traduci questa applicazione..."
+
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr "_Deseleziona Tutti"
+
+#: rapid/glade3/rapid.ui.h:16
 msgid "_File"
 msgstr "_File"
 
-#: rapid/glade3/rapid.ui.h:3
+#: rapid/glade3/rapid.ui.h:17
 msgid "Download / Pause"
 msgstr "Download / Sospendi"
 
-#: rapid/glade3/rapid.ui.h:4
+#: rapid/glade3/rapid.ui.h:18
 msgid "_Select"
 msgstr "_Seleziona"
 
-#: rapid/glade3/rapid.ui.h:5
+#: rapid/glade3/rapid.ui.h:19
 msgid "Select All Without _Job Code"
 msgstr "Seleziona Tutto _Senza il Codice _Lavoro"
 
-#: rapid/glade3/rapid.ui.h:6
+#: rapid/glade3/rapid.ui.h:20
 msgid "Select All Wit_h Job Code"
 msgstr "Seleziona Tutto _Con il Codice Lavoro"
 
-#: rapid/glade3/rapid.ui.h:7
+#: rapid/glade3/rapid.ui.h:21
 msgid "_View"
 msgstr "_Visualizza"
 
-#: rapid/glade3/rapid.ui.h:8
+#: rapid/glade3/rapid.ui.h:22
 msgid "_Error Log"
 msgstr "_Registro errori"
 
-#: rapid/glade3/rapid.ui.h:9
+#: rapid/glade3/rapid.ui.h:23
 msgid "_Clear Completed Downloads"
 msgstr "_Svotare i Downloads Completati"
 
-#: rapid/glade3/rapid.ui.h:10
+#: rapid/glade3/rapid.ui.h:24
 msgid "Previous File"
 msgstr "File precedente"
 
-#: rapid/glade3/rapid.ui.h:11
+#: rapid/glade3/rapid.ui.h:25
 msgid "Next File"
 msgstr "File successivo"
 
-#: rapid/glade3/rapid.ui.h:12
+#: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: rapid/glade3/rapid.ui.h:13
-msgid "_Make a Donation..."
-msgstr "_Fai una donazione..."
-
-#: rapid/glade3/rapid.ui.h:14
+#: rapid/glade3/rapid.ui.h:27
 msgid "_Translate this Application..."
 msgstr "_Traduci questa Applicazione..."
 
-#: 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:17
+#: rapid/glade3/rapid.ui.h:28
 msgid "_Include in download"
 msgstr "_Includi nel download"
 
-#: rapid/glade3/rapid.ui.h:18
+#: rapid/glade3/rapid.ui.h:29
 msgid "_Download"
 msgstr "_Download"
 
@@ -1842,7 +1944,7 @@ msgstr ""
 "in posizioni multiple, come ad esempio su dischi esterni."
 
 #: rapid/glade3/prefs.ui.h:69
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr "Effettua il backup delle foto e dei video durante il download"
 
 #: rapid/glade3/prefs.ui.h:70
@@ -1884,8 +1986,8 @@ msgid "Video backup location:"
 msgstr "Posizione del salvataggio dei video"
 
 #: rapid/glade3/prefs.ui.h:79
-msgid "Backup"
-msgstr "Backup"
+msgid "Back up"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:80
 msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
@@ -1921,35 +2023,39 @@ msgstr ""
 msgid "Automatically rotate JPEG images"
 msgstr "Ruota automaticamente le immagini JPEG"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr "Controllare i file mentre vengono scaricati"
+
+#: rapid/glade3/prefs.ui.h:90
 msgid "Performance"
 msgstr "Prestazioni"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:91
 msgid "Generate thumbnails (slower)"
 msgstr "Generazione delle miniature (lento)"
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:92
 msgid "Miscellaneous"
 msgstr "Varie"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 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
+#: rapid/glade3/prefs.ui.h:94
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Nomi di foto e video in conflitto</b>"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Add unique identifier"
 msgstr "Aggiunta di un identificatore univoco"
 
-#: rapid/glade3/prefs.ui.h:94
+#: rapid/glade3/prefs.ui.h:96
 msgid "Skip download"
 msgstr "Salta il download"
 
-#: rapid/glade3/prefs.ui.h:95
+#: rapid/glade3/prefs.ui.h:97
 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."
@@ -1957,7 +2063,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:96
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1965,15 +2071,15 @@ 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
+#: rapid/glade3/prefs.ui.h:99
 msgid "Overwrite"
 msgstr "Sovrascrivi"
 
-#: rapid/glade3/prefs.ui.h:98
+#: rapid/glade3/prefs.ui.h:100
 msgid "Skip"
 msgstr "Salta"
 
-#: rapid/glade3/prefs.ui.h:99
+#: rapid/glade3/prefs.ui.h:101
 msgid "Error Handling"
 msgstr "Gestione degli errori"
 
@@ -2394,6 +2500,9 @@ msgstr "Importa le tue foto ed i video in modo efficiente ed affidabile"
 #~ msgid "Automation"
 #~ msgstr "Automazione"
 
+#~ msgid "Backup"
+#~ msgstr "Backup"
+
 #~ msgid "Backup folder name:"
 #~ msgstr "Nome della cartella di backup:"
 
@@ -2520,9 +2629,6 @@ msgstr "Importa le tue foto ed i video in modo efficiente ed affidabile"
 #~ "Specificare se l'immagine o i nomi di cartella dovrebbero avere rimossi i "
 #~ "caratteri non permessi da altri sistemi operativi."
 
-#~ msgid "_Report a Problem..."
-#~ msgstr "_Segnala un Problema..."
-
 #~ msgid "_Photos"
 #~ msgstr "_Fotografie"
 
@@ -2533,9 +2639,6 @@ msgstr "Importa le tue foto ed i video in modo efficiente ed affidabile"
 #~ "Si possono salvare in locazioni diverse le proprie fotografie mentre vengono "
 #~ "scaricate, ad esempio un dischi esterni."
 
-#~ msgid "_Get Help Online..."
-#~ msgstr "_Richiedi Aiuto In Linea..."
-
 #~ msgid "_Thumbnails"
 #~ msgstr "_Miniature"
 
diff --git a/po/ja.po b/po/ja.po
index 67b4146..86afcc3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1562,7 +1562,7 @@ msgid "Backup"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:36
diff --git a/po/nb.po b/po/nb.po
index bd5b400..b234ba0 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-06-23 04:00-0500\n"
-"PO-Revision-Date: 2012-06-25 09:45+0000\n"
-"Last-Translator: Erik M <Unknown>\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:14+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\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-09-11 00:24+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:119
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:122
+#: rapid/rapid.py:127
 #, 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:157
+#: rapid/rapid.py:162
 msgid "Device"
 msgstr "Enhet"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:175
+#: rapid/rapid.py:180
 msgid "Size"
 msgstr "Størrelse"
 
-#: rapid/rapid.py:178
+#: rapid/rapid.py:183
 msgid "Download Progress"
 msgstr "Status for nedlasting"
 
-#: rapid/rapid.py:336
+#: rapid/rapid.py:343
 #, 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:1216
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr "søker..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1782
+#: rapid/rapid.py:1818
 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:1786
+#: rapid/rapid.py:1822
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Laster ned fra %(location)s."
 
-#: rapid/rapid.py:1787
+#: rapid/rapid.py:1823
 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:2209
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr "Last ned"
 
-#: rapid/rapid.py:2212
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr "Pause"
 
-#: rapid/rapid.py:2317
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -108,7 +108,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2320
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -117,176 +117,187 @@ msgstr ""
 "Denne mappen for nedlasting er ugyldig:\n"
 "%s"
 
-#: rapid/rapid.py:2321
+#: rapid/rapid.py:2380
 msgid "Download cannot proceed"
 msgstr "Kan ikke fortsette nedlasting"
 
-#: rapid/rapid.py:2700
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "bilder"
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "videoklipp"
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr ""
+
+#: rapid/rapid.py:2802
 msgid "About 1 second remaining"
 msgstr "Rundt 1 sekund igjen"
 
-#: rapid/rapid.py:2702
+#: rapid/rapid.py:2804
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Omtrent %i sekunder igjen"
 
-#: rapid/rapid.py:2704
+#: rapid/rapid.py:2806
 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:2709
+#: rapid/rapid.py:2811
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Omtrent %(minutes)i minutter og %(seconds)02i sekunder igjen"
 
-#: rapid/rapid.py:2731 rapid/rpdfile.py:123
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
 msgid "photos and videos"
 msgstr "bilder og videoer"
 
-#: rapid/rapid.py:2733 rapid/rpdfile.py:125
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
 msgid "photos or videos"
 msgstr "bilder eller video"
 
-#: rapid/rapid.py:2736 rapid/rapid.py:3558 rapid/rpdfile.py:128
-msgid "videos"
-msgstr "videoklipp"
-
-#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
-#: rapid/rpdfile.py:291
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
 msgid "video"
 msgstr "video"
 
-#: 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:2743 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
-#: rapid/rpdfile.py:272
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
 msgid "photo"
 msgstr "bilde"
 
-#: rapid/rapid.py:2770
+#: rapid/rapid.py:2872
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s nedlastet"
 
-#: rapid/rapid.py:2774
+#: rapid/rapid.py:2876
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "Klarte ikke a laste ned %(noFiles)s %(filetypes)s"
 
-#: rapid/rapid.py:2777 rapid/rapid.py:2829
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
 msgid "warnings"
 msgstr "advarsler"
 
-#: rapid/rapid.py:2786
+#: rapid/rapid.py:2892
 msgid "All downloads complete"
 msgstr "Ferdig med nedlasting"
 
-#: rapid/rapid.py:2792 rapid/rapid.py:2801 rapid/rapid.py:2810
-#: rapid/rapid.py:2819 rapid/rapid.py:2827
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2794 rapid/rapid.py:2812
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s lastet ned"
 
-#: rapid/rapid.py:2803 rapid/rapid.py:2821
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, 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:2860
+#: rapid/rapid.py:2970
 #, 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:2867
+#: rapid/rapid.py:2977
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s av %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3222
+#: rapid/rapid.py:3331
 msgid "From"
 msgstr "Fra"
 
-#: rapid/rapid.py:3230
+#: rapid/rapid.py:3339
 msgid "Auto Detect"
 msgstr "Oppdag automatisk"
 
-#: rapid/rapid.py:3234 rapid/preferencesdialog.py:1327
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Velg katalog med %(file_types)r"
 
-#: rapid/rapid.py:3275
+#: rapid/rapid.py:3384
 msgid "Copy"
 msgstr "Kopier"
 
-#: rapid/rapid.py:3288
+#: rapid/rapid.py:3397
 msgid "Move"
 msgstr "Flytt"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3419
 msgid "To"
 msgstr "Til"
 
-#: rapid/rapid.py:3317 rapid/rapid.py:3986
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
 msgid "Photos:"
 msgstr "Bilder:"
 
-#: rapid/rapid.py:3320 rapid/preferencesdialog.py:1164
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
 msgid "Select a folder to download photos to"
 msgstr "Velg katalog for å laste inn bilder"
 
-#: rapid/rapid.py:3332 rapid/rapid.py:3986
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
 msgid "Videos:"
 msgstr "Videoer:"
 
-#: rapid/rapid.py:3334 rapid/preferencesdialog.py:1182
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
 msgid "Select a folder to download videos to"
 msgstr "Velg katalog for å laste inn video"
 
-#: rapid/rapid.py:3526
+#: rapid/rapid.py:3650
 msgid "and"
 msgstr "og"
 
-#: rapid/rapid.py:3531
+#: rapid/rapid.py:3655
 msgid "Using backup devices"
 msgstr "Bruker sikkerhetskopierings enheter"
 
-#: rapid/rapid.py:3533
+#: rapid/rapid.py:3657
 msgid "Using backup device"
 msgstr "Bruker sikkerhetskopierings enhet"
 
-#: rapid/rapid.py:3535
+#: rapid/rapid.py:3659
 msgid "No backup devices detected"
 msgstr "Fant ingen enheter for sikkerhetskopiering"
 
-#: rapid/rapid.py:3562
+#: rapid/rapid.py:3686
 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:3574
+#: rapid/rapid.py:3698
 #, 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:3578
+#: rapid/rapid.py:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -294,87 +305,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:3583
+#: rapid/rapid.py:3707
 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:3588
+#: rapid/rapid.py:3712
 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:3594
+#: rapid/rapid.py:3718
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s tilgjengelig"
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3602
+#: rapid/rapid.py:3726
 #, 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:3605
+#: rapid/rapid.py:3729
 #, 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:3608
+#: rapid/rapid.py:3732
 #, 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:3615
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3644
+#: rapid/rapid.py:3768
 msgid "Program preferences are invalid"
 msgstr "Programinnstillingene er ugyldige"
 
-#: rapid/rapid.py:3770 rapid/rpdfile.py:273
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
 msgid "Photo"
 msgstr "Bilde"
 
-#: rapid/rapid.py:3772 rapid/rpdfile.py:292
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:3781
+#: rapid/rapid.py:3921
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "Nedlastningsmappe til %(file_type)s finnes ikke"
 
-#: rapid/rapid.py:3783 rapid/rapid.py:3797 rapid/rapid.py:3810
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
 msgid "Folder: %s"
 msgstr "Mappe: %s"
 
-#: rapid/rapid.py:3795
+#: rapid/rapid.py:3935
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "Nedlastingsmappe til %(file_type)s er ugyldig"
 
-#: rapid/rapid.py:3808
+#: rapid/rapid.py:3948
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "Nedlastingsmappen til %(file_type)s er ikke skrivbar"
 
-#: rapid/rapid.py:3894
+#: rapid/rapid.py:4034
 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:3949
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -383,61 +394,62 @@ msgstr ""
 "vis programinformasjon på kommandolinjen når programmet kjører (standard: "
 "%default)"
 
-#: rapid/rapid.py:3950
+#: rapid/rapid.py:4090
 msgid "display debugging information when run from the command line"
 msgstr "vis feilrettingsinformasjon ved kjøring fra kommandolinje"
 
-#: rapid/rapid.py:3951
+#: rapid/rapid.py:4091
 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:3953
+#: rapid/rapid.py:4093
 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:3955
+#: rapid/rapid.py:4095
 msgid ""
 "automatically detect devices from which to download, overwriting existing "
 "program preferences"
 msgstr ""
 
-#: rapid/rapid.py:3956
+#: rapid/rapid.py:4096
 msgid ""
 "manually specify the PATH of the device from which to download, overwriting "
 "existing program preferences"
 msgstr ""
 
-#: rapid/rapid.py:3957
+#: rapid/rapid.py:4097
 msgid "reset all program settings and preferences and exit"
 msgstr "nullstill alle programinnstillinger og avslutt"
 
-#: rapid/rapid.py:3970
+#: rapid/rapid.py:4110
 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
+#: rapid/rapid.py:4133
 #, python-format
 msgid "and %s"
 msgstr "og %s"
 
-#: rapid/rapid.py:3999
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
 msgstr "Alle innstillingene er nullstillte"
 
-#: rapid/backupfile.py:157 rapid/backupfile.py:180
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
 msgid "Backing up error"
 msgstr "Feil ved sikkerhetskopiering"
 
-#: rapid/backupfile.py:159
+#: rapid/backupfile.py:151
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Klarte ikke å opprette målmappen %(directory)s\n"
 
-#: rapid/backupfile.py:161 rapid/backupfile.py:182 rapid/subfolderfile.py:199
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -446,13 +458,29 @@ msgstr ""
 "Kilde: %(source)s\n"
 "Mål: %(destination)s"
 
-#: rapid/backupfile.py:164 rapid/backupfile.py:184
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Feil: %(inst)s"
 
-#: rapid/copyfiles.py:163 rapid/subfolderfile.py:214
-#: rapid/subfolderfile.py:347 rapid/subfolderfile.py:365
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -461,6 +489,10 @@ msgstr ""
 "%(problem)s\n"
 "Fil: %(file)s"
 
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr ""
+
 #: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Enhet funnet"
@@ -944,20 +976,20 @@ msgstr "Oppgi en filsti som det ikke vil letes etter bilder eller video"
 msgid "Path:"
 msgstr "Filbane:"
 
-#: rapid/preferencesdialog.py:1082
+#: rapid/preferencesdialog.py:1092
 msgid "Job Code"
 msgstr "Jobbnavn"
 
-#: rapid/preferencesdialog.py:1353
+#: rapid/preferencesdialog.py:1363
 msgid "Select a folder in which to backup photos"
 msgstr "Velg en mappe for sikkerhetskopiering av bilder"
 
-#: rapid/preferencesdialog.py:1366
+#: rapid/preferencesdialog.py:1376
 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:1461
+#: rapid/preferencesdialog.py:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -965,7 +997,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:1512
+#: rapid/preferencesdialog.py:1524
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -974,13 +1006,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:1515
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Eksempel: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1605
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -990,7 +1022,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:1750
+#: rapid/preferencesdialog.py:1762
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -1001,7 +1033,7 @@ msgstr ""
 "endrer dem:\n"
 "%s"
 
-#: rapid/preferencesdialog.py:1752
+#: rapid/preferencesdialog.py:1764
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -1012,17 +1044,17 @@ msgstr ""
 "det:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1753
+#: rapid/preferencesdialog.py:1765
 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:1934
+#: rapid/preferencesdialog.py:1949
 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:1936
+#: rapid/preferencesdialog.py:1951
 msgid "externaldrive2"
 msgstr "eksterndisk2"
 
@@ -1099,55 +1131,60 @@ msgid "Stockholm"
 msgstr "Stockholm"
 
 #. components
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:358
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
 msgstr "undermappe"
 
-#: rapid/problemnotification.py:28 rapid/subfolderfile.py:356
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr "filnavn"
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr "Dato tidsverdien %s fremstår som ugyldig."
 
-#: rapid/problemnotification.py:82
+#: rapid/problemnotification.py:86
 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:84
+#: rapid/problemnotification.py:88
 msgid "Filename does not have a number component."
 msgstr "Filnavnet mangler nummerdelen."
 
-#: rapid/problemnotification.py:85
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr "Feil ved oppretting av %s-komponenten."
 
 #. a generic problem
-#: rapid/problemnotification.py:87
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr "%(filetype)s metadata kan ikke leses"
 
-#: rapid/problemnotification.py:89
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "%(filetype)s %(area)s kunne ikke opprettes"
 
-#: rapid/problemnotification.py:91 rapid/problemnotification.py:92
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr "En feil oppstod ved kopiering av %(filetype)s"
 
-#: rapid/problemnotification.py:94 rapid/problemnotification.py:95
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr ""
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "%(filetype)s finnes allerede"
 
-#: rapid/problemnotification.py:98
+#: rapid/problemnotification.py:105
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1156,7 +1193,7 @@ msgstr ""
 "%(filetype)s could not be backed up because no suitable backup locations "
 "were found."
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:110
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -1165,65 +1202,71 @@ 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:104
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "%(filetype)s er allerede lastet ned"
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:115
 #, 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:109
+#: rapid/problemnotification.py:116
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 
-#: rapid/problemnotification.py:110
+#: rapid/problemnotification.py:117
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr "Mangler data for å navngi %(filetype)s."
 
-#: rapid/problemnotification.py:112
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Feil: %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:202
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr "Metadataen kan være korrupt."
 
-#: rapid/problemnotification.py:205
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
 msgstr ""
 
-#: rapid/problemnotification.py:224
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " Det ble sikkerhetskopiert til %(volume)s"
 
-#: rapid/problemnotification.py:226
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr " Det ble sikkerhetskopiert til disse enhetene: "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:229 rapid/problemnotification.py:290
-#: rapid/problemnotification.py:302
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s og %(final_volume)s."
 
-#: rapid/problemnotification.py:241
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
@@ -1232,260 +1275,311 @@ msgstr ""
 "Bilder funnet med samme filnavn, men tatt ved forskjellige tidspunkt: "
 "%(details)s"
 
-#: rapid/problemnotification.py:258
+#: rapid/problemnotification.py:269
 #, 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:260
+#: rapid/problemnotification.py:271
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr "En feil oppstod ved sikkerhetskopiering til %(volume)s."
 
-#: rapid/problemnotification.py:262
+#: rapid/problemnotification.py:273
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr "Flere feil oppstod ved sikkerhetskopiering til følgende enheter: "
 
-#: rapid/problemnotification.py:266 rapid/problemnotification.py:314
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:268
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:272 rapid/problemnotification.py:316
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr "%(volumes)s og %(volume)s (%(inst)s)."
 
-#: rapid/problemnotification.py:277
+#: rapid/problemnotification.py:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s og %(volume)s."
 
-#: rapid/problemnotification.py:285
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "Sikkerhetskopi finnes allerede på %(volume)s."
 
-#: rapid/problemnotification.py:287
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr "Sikkerhetskopier finnes allerede i disse plasseringene: "
 
-#: rapid/problemnotification.py:297
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "Sikkerhetskopi overskrevet på %(volume)s."
 
-#: rapid/problemnotification.py:299
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr "Sikkerhetskopier overskrevet på  disse enhetene: "
 
-#: rapid/problemnotification.py:310
+#: rapid/problemnotification.py:321
 #, 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:312
+#: rapid/problemnotification.py:323
 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:323
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "%(previousproblem)s i tillegg, %(newproblem)s"
 
-#: rapid/problemnotification.py:331
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " Dessuten, var det %(problems)s."
 
-#: rapid/problemnotification.py:333
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " Dessuten, var det ett %(problem)s."
 
-#: rapid/problemnotification.py:342
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "%(type)s metadata mangler."
 
-#: rapid/problemnotification.py:344
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr "Følgende metadata mangler: "
 
-#: rapid/problemnotification.py:347
+#: rapid/problemnotification.py:371
 #, 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:364
+#: rapid/problemnotification.py:388
 msgid "Problems in subfolder and filename generation"
 msgstr "Flere problemer ved oppretting av undermapper og filnavn"
 
-#: rapid/problemnotification.py:366
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr "Problem ved oppretting av undermappe og filnavn"
 
-#: rapid/problemnotification.py:369
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Problemer ved oppretting av %s"
 
-#: rapid/problemnotification.py:371
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Problem ved oppretting av %s"
 
-#: rapid/problemnotification.py:380
+#: rapid/problemnotification.py:404
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr "%(filetype)s finnes allerede, men den ble sikkerhetskopiert"
 
-#: rapid/problemnotification.py:382
+#: rapid/problemnotification.py:406
 #, 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:402
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr "Flere feil oppstod"
 
-#: rapid/problemnotification.py:404 rapid/subfolderfile.py:233
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr "Bilder funnet med samme filnavn, men tatt ved forskjellige tidspunkt"
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr "det oppstod flere feil ved sikkerhetskopieringen"
 
-#: rapid/problemnotification.py:411
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr "Det oppstod flere feil ved sikkerhetskopieringen"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr "det oppstod en feil ved sikkerhetskopieringen"
 
-#: rapid/problemnotification.py:414
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr "Det oppstod en feil under sikkerhetskopieringen"
 
 #. e.g.
-#: rapid/problemnotification.py:417
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, og %(backinguperror)s"
 
-#: rapid/rpdfile.py:153
+#: rapid/rpdfile.py:159
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/rpdfile.py:163
+#: rapid/rpdfile.py:169
 #, python-format
 msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 msgstr ""
 
-#: rapid/subfolderfile.py:80
+#: rapid/subfolderfile.py:81
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr "undermappe og filnavn"
+
+#: rapid/subfolderfile.py:406
 msgid "Photo has already been downloaded"
 msgstr "Bildet er allerede lastet ned"
 
-#: rapid/subfolderfile.py:302
+#: rapid/subfolderfile.py:407
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Kilde: %(source)s"
 
-#: rapid/subfolderfile.py:354
-msgid "subfolder and filename"
-msgstr "undermappe og filnavn"
-
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:485
 msgid "Failed to create download subfolder"
 msgstr "Klarte ikke å opprette undermappe for nedlasting"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:486
 #, python-format
 msgid "Path: %s"
 msgstr "Filbane: %s"
 
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr ""
+
 #: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
+msgstr "_Merk alle"
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "_Gi en donasjon..."
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr "_Fjern all markering"
+
+#: rapid/glade3/rapid.ui.h:16
 msgid "_File"
 msgstr "_Fil"
 
-#: rapid/glade3/rapid.ui.h:3
+#: rapid/glade3/rapid.ui.h:17
 msgid "Download / Pause"
 msgstr "Last ned / Pause"
 
-#: rapid/glade3/rapid.ui.h:4
+#: rapid/glade3/rapid.ui.h:18
 msgid "_Select"
 msgstr "_Velg"
 
-#: rapid/glade3/rapid.ui.h:5
+#: rapid/glade3/rapid.ui.h:19
 msgid "Select All Without _Job Code"
 msgstr "Velg alle _uten jobbnavn"
 
-#: rapid/glade3/rapid.ui.h:6
+#: rapid/glade3/rapid.ui.h:20
 msgid "Select All Wit_h Job Code"
 msgstr ""
 
-#: rapid/glade3/rapid.ui.h:7
+#: rapid/glade3/rapid.ui.h:21
 msgid "_View"
 msgstr "_Vis"
 
-#: rapid/glade3/rapid.ui.h:8
+#: rapid/glade3/rapid.ui.h:22
 msgid "_Error Log"
 msgstr "_Feillogg"
 
-#: rapid/glade3/rapid.ui.h:9
+#: rapid/glade3/rapid.ui.h:23
 msgid "_Clear Completed Downloads"
 msgstr "_Fjern fullførte nedlastinger"
 
-#: rapid/glade3/rapid.ui.h:10
+#: rapid/glade3/rapid.ui.h:24
 msgid "Previous File"
 msgstr "Forrige fil"
 
-#: rapid/glade3/rapid.ui.h:11
+#: rapid/glade3/rapid.ui.h:25
 msgid "Next File"
 msgstr "Neste fil"
 
-#: rapid/glade3/rapid.ui.h:12
+#: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: rapid/glade3/rapid.ui.h:13
-msgid "_Make a Donation..."
-msgstr "_Gi en donasjon..."
-
-#: rapid/glade3/rapid.ui.h:14
+#: rapid/glade3/rapid.ui.h:27
 msgid "_Translate this Application..."
 msgstr "_Oversett dette programmet..."
 
-#: rapid/glade3/rapid.ui.h:15
-msgid "_Check All"
-msgstr "_Merk alle"
-
-#: rapid/glade3/rapid.ui.h:16
-msgid "_Uncheck All"
-msgstr "_Fjern all markering"
-
-#: rapid/glade3/rapid.ui.h:17
+#: rapid/glade3/rapid.ui.h:28
 msgid "_Include in download"
 msgstr "_Inkluder i  nedlasting"
 
-#: rapid/glade3/rapid.ui.h:18
+#: rapid/glade3/rapid.ui.h:29
 msgid "_Download"
 msgstr "_Last ned"
 
@@ -1781,7 +1875,7 @@ msgid ""
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:69
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr "Ta sikkerhetskopi av bilder og video ved nedlasting"
 
 #: rapid/glade3/prefs.ui.h:70
@@ -1818,8 +1912,8 @@ msgid "Video backup location:"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:79
-msgid "Backup"
-msgstr "Sikkerhetskopi"
+msgid "Back up"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:80
 msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
@@ -1853,35 +1947,39 @@ msgstr "Avslutt programmet selv om nedlastingen hadde feil eller advarsler"
 msgid "Automatically rotate JPEG images"
 msgstr "Rotèr JPEG-bilder automatisk"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:90
 msgid "Performance"
 msgstr "Ytelse"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:91
 msgid "Generate thumbnails (slower)"
 msgstr "Lag miniatyrbilder (tregere)"
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:92
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Feilhåndtering</span>"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Bilde og video navnekonflikter</b>"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Add unique identifier"
 msgstr "Legg til unik identifikator"
 
-#: rapid/glade3/prefs.ui.h:94
+#: rapid/glade3/prefs.ui.h:96
 msgid "Skip download"
 msgstr "Hopp over nedlasting"
 
-#: rapid/glade3/prefs.ui.h:95
+#: rapid/glade3/prefs.ui.h:97
 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."
@@ -1889,7 +1987,7 @@ msgstr ""
 "Velg om du skal hoppe over filen eller legge til en unik identifikator når "
 "ett bilde eller video med det samme navnet er lastet ned fra før."
 
-#: rapid/glade3/prefs.ui.h:96
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1897,15 +1995,15 @@ msgstr ""
 "Under sikkerhetskopiering, velg om du vil overskrive eller hoppe over filer "
 "med samme navn på sikkerhetskopierings enheten."
 
-#: rapid/glade3/prefs.ui.h:97
+#: rapid/glade3/prefs.ui.h:99
 msgid "Overwrite"
 msgstr "Skriv over"
 
-#: rapid/glade3/prefs.ui.h:98
+#: rapid/glade3/prefs.ui.h:100
 msgid "Skip"
 msgstr "Hopp over"
 
-#: rapid/glade3/prefs.ui.h:99
+#: rapid/glade3/prefs.ui.h:101
 msgid "Error Handling"
 msgstr "Feilhåndtering"
 
@@ -1935,3 +2033,6 @@ msgstr "Importer dine bilder og videoer effektivt og pålitelig"
 #~ msgid "This device or partition will never be used to download from"
 #~ msgstr ""
 #~ "Denne enheten eller partisjonen vil aldri bli brukt til å laste ned fra"
+
+#~ msgid "Backup"
+#~ msgstr "Sikkerhetskopi"
diff --git a/po/nl.po b/po/nl.po
index 70b0b4a..d7df432 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,23 +7,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\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"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:17+0000\n"
 "Last-Translator: A.J. Baudrez <a.baudrez@gmail.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
-"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-25 00:48+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\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:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -32,33 +32,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:119
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:122
+#: rapid/rapid.py:127
 #, 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:157
+#: rapid/rapid.py:162
 msgid "Device"
 msgstr "Apparaat"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:175
+#: rapid/rapid.py:180
 msgid "Size"
 msgstr "Grootte"
 
-#: rapid/rapid.py:178
+#: rapid/rapid.py:183
 msgid "Download Progress"
 msgstr "Downloadvoortgang"
 
-#: rapid/rapid.py:336
+#: rapid/rapid.py:343
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s werd niet ontkoppeld"
@@ -67,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:1216
+#: rapid/rapid.py:1241
 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:1782
+#: rapid/rapid.py:1818
 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:1786
+#: rapid/rapid.py:1822
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Aan het downloaden van %(location)s."
 
-#: rapid/rapid.py:1787
+#: rapid/rapid.py:1823
 msgid ""
 "Do you really want to download from here? On some systems, scanning this "
 "location can take a very long time."
@@ -90,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:2209
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr "Download"
 
-#: rapid/rapid.py:2212
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr "Pauze"
 
-#: rapid/rapid.py:2317
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -109,7 +109,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2320
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -118,176 +118,190 @@ msgstr ""
 "Deze downloadmap is ongeldig:\n"
 "%s"
 
-#: rapid/rapid.py:2321
+#: rapid/rapid.py:2380
 msgid "Download cannot proceed"
 msgstr "Download kan niet plaatsgrijpen"
 
-#: rapid/rapid.py:2700
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+"Geen enkel backup apparaat bevat een geldige folder om %(filetype)s te "
+"backuppen"
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "foto's"
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "video's"
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr "Backup probleem"
+
+#: rapid/rapid.py:2802
 msgid "About 1 second remaining"
 msgstr "Ongeveer 1 seconde te gaan"
 
-#: rapid/rapid.py:2702
+#: rapid/rapid.py:2804
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Ongeveer %i seconden te gaan"
 
-#: rapid/rapid.py:2704
+#: rapid/rapid.py:2806
 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:2709
+#: rapid/rapid.py:2811
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Ongeveer %(minutes)i:%(seconds)02i minuten te gaan"
 
-#: rapid/rapid.py:2731 rapid/rpdfile.py:123
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
 msgid "photos and videos"
 msgstr "foto's en video's"
 
-#: rapid/rapid.py:2733 rapid/rpdfile.py:125
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
 msgid "photos or videos"
 msgstr "foto's of video's"
 
-#: rapid/rapid.py:2736 rapid/rapid.py:3558 rapid/rpdfile.py:128
-msgid "videos"
-msgstr "video's"
-
-#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
-#: rapid/rpdfile.py:291
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
 msgid "video"
 msgstr "video"
 
-#: 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:2743 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
-#: rapid/rpdfile.py:272
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
 msgid "photo"
 msgstr "foto"
 
-#: rapid/rapid.py:2770
+#: rapid/rapid.py:2872
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s gedownload"
 
-#: rapid/rapid.py:2774
+#: rapid/rapid.py:2876
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s kon niet gedownload worden"
 
-#: rapid/rapid.py:2777 rapid/rapid.py:2829
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
 msgid "warnings"
 msgstr "verwittigingen"
 
-#: rapid/rapid.py:2786
+#: rapid/rapid.py:2892
 msgid "All downloads complete"
 msgstr "Alle downloads zijn afgelopen"
 
-#: rapid/rapid.py:2792 rapid/rapid.py:2801 rapid/rapid.py:2810
-#: rapid/rapid.py:2819 rapid/rapid.py:2827
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2794 rapid/rapid.py:2812
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s gedownload"
 
-#: rapid/rapid.py:2803 rapid/rapid.py:2821
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, 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:2860
+#: rapid/rapid.py:2970
 #, 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)"
+msgstr ""
+"%(number)s van de %(total)s %(filetypes)s (%(remaining)s blijven over)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:2977
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s van %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3222
+#: rapid/rapid.py:3331
 msgid "From"
 msgstr "Van"
 
-#: rapid/rapid.py:3230
+#: rapid/rapid.py:3339
 msgid "Auto Detect"
 msgstr "Automatisch detecteren"
 
-#: rapid/rapid.py:3234 rapid/preferencesdialog.py:1327
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Selecteer een map die %(file_types)s bevat"
 
-#: rapid/rapid.py:3275
+#: rapid/rapid.py:3384
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: rapid/rapid.py:3288
+#: rapid/rapid.py:3397
 msgid "Move"
 msgstr "Verplaatsen"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3419
 msgid "To"
 msgstr "Naar"
 
-#: rapid/rapid.py:3317 rapid/rapid.py:3986
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
 msgid "Photos:"
 msgstr "Foto's:"
 
-#: rapid/rapid.py:3320 rapid/preferencesdialog.py:1164
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
 msgid "Select a folder to download photos to"
 msgstr "Duid een map aan om de foto's naar toe te downloaden"
 
-#: rapid/rapid.py:3332 rapid/rapid.py:3986
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
 msgid "Videos:"
 msgstr "Video's:"
 
-#: rapid/rapid.py:3334 rapid/preferencesdialog.py:1182
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
 msgid "Select a folder to download videos to"
 msgstr "Selecteer een map om de video's naar toe te downloaden"
 
-#: rapid/rapid.py:3526
+#: rapid/rapid.py:3650
 msgid "and"
 msgstr "en"
 
-#: rapid/rapid.py:3531
+#: rapid/rapid.py:3655
 msgid "Using backup devices"
 msgstr "Backup apparaten aan het gebruiken"
 
-#: rapid/rapid.py:3533
+#: rapid/rapid.py:3657
 msgid "Using backup device"
 msgstr "Backup apparaat aan het gebruiken"
 
-#: rapid/rapid.py:3535
+#: rapid/rapid.py:3659
 msgid "No backup devices detected"
 msgstr "Geen backup apparaat gedetecteerd"
 
-#: rapid/rapid.py:3562
+#: rapid/rapid.py:3686
 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:3574
+#: rapid/rapid.py:3698
 #, 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:3578
+#: rapid/rapid.py:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -295,87 +309,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:3583
+#: rapid/rapid.py:3707
 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:3588
+#: rapid/rapid.py:3712
 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:3594
+#: rapid/rapid.py:3718
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s vrij"
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3602
+#: rapid/rapid.py:3726
 #, 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:3605
+#: rapid/rapid.py:3729
 #, 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:3608
+#: rapid/rapid.py:3732
 #, 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:3615
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3644
+#: rapid/rapid.py:3768
 msgid "Program preferences are invalid"
 msgstr "Programma voorkeuren zijn ongeldig"
 
-#: rapid/rapid.py:3770 rapid/rpdfile.py:273
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
 msgid "Photo"
 msgstr "Foto"
 
-#: rapid/rapid.py:3772 rapid/rpdfile.py:292
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:3781
+#: rapid/rapid.py:3921
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s downloadmap bestaat niet"
 
-#: rapid/rapid.py:3783 rapid/rapid.py:3797 rapid/rapid.py:3810
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
 msgid "Folder: %s"
 msgstr "Map: %s"
 
-#: rapid/rapid.py:3795
+#: rapid/rapid.py:3935
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s downloadmap is ongeldig"
 
-#: rapid/rapid.py:3808
+#: rapid/rapid.py:3948
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s downloadmap is niet beschrijfbaar"
 
-#: rapid/rapid.py:3894
+#: rapid/rapid.py:4034
 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:3949
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -384,22 +398,22 @@ msgstr ""
 "vertoon programma informatie op de commando lijn wanneer het programma "
 "draait (standaard: %default)"
 
-#: rapid/rapid.py:3950
+#: rapid/rapid.py:4090
 msgid "display debugging information when run from the command line"
 msgstr "vertoon debug informatie wanneer uitgevoerd vanaf de commando prompt"
 
-#: rapid/rapid.py:3951
+#: rapid/rapid.py:4091
 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:3953
+#: rapid/rapid.py:4093
 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:3955
+#: rapid/rapid.py:4095
 msgid ""
 "automatically detect devices from which to download, overwriting existing "
 "program preferences"
@@ -407,7 +421,7 @@ msgstr ""
 "detecteer automatisch apparaten om van te downloaden, overschrijf daarbij de "
 "programma voorkeuren"
 
-#: rapid/rapid.py:3956
+#: rapid/rapid.py:4096
 msgid ""
 "manually specify the PATH of the device from which to download, overwriting "
 "existing program preferences"
@@ -415,11 +429,11 @@ msgstr ""
 "specificeer manueel het PAD van het apparaat om van te downloaden, "
 "overschrijf daarbij de programma voorkeuren"
 
-#: rapid/rapid.py:3957
+#: rapid/rapid.py:4097
 msgid "reset all program settings and preferences and exit"
 msgstr "herstel alle programma instellingen en verlaat het programma"
 
-#: rapid/rapid.py:3970
+#: rapid/rapid.py:4110
 msgid ""
 "Error: specify device auto-detection or manually specify a device's path "
 "from which to download, but do not do both."
@@ -427,25 +441,26 @@ 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:3991
+#: rapid/rapid.py:4133
 #, python-format
 msgid "and %s"
 msgstr "en %s"
 
-#: rapid/rapid.py:3999
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
 msgstr "Alle instellingen en voorkeuren werden hersteld"
 
-#: rapid/backupfile.py:157 rapid/backupfile.py:180
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
 msgid "Backing up error"
 msgstr "Backup fout"
 
-#: rapid/backupfile.py:159
+#: rapid/backupfile.py:151
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Doelmap kon niet aangemaakt worden: %(directory)s\n"
 
-#: rapid/backupfile.py:161 rapid/backupfile.py:182 rapid/subfolderfile.py:199
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -454,13 +469,29 @@ msgstr ""
 "Bron: %(source)s\n"
 "Doel: %(destination)s"
 
-#: rapid/backupfile.py:164 rapid/backupfile.py:184
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Fout: %(inst)s"
 
-#: rapid/copyfiles.py:163 rapid/subfolderfile.py:214
-#: rapid/subfolderfile.py:347 rapid/subfolderfile.py:365
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr "Backup %(file_type)s overschreven"
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr "%(file_type)s is niet gebackupped"
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr "Backup van %(file_type)s bestaat reeds"
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -469,6 +500,10 @@ msgstr ""
 "%(problem)s\n"
 "Bestand: %(file)s"
 
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr "Er is een onbekende fout opgetreden"
+
 #: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Apparaat gedetecteerd"
@@ -952,20 +987,20 @@ msgstr "Geef een pad op dat nooit op foto's of video's gescand zal worden"
 msgid "Path:"
 msgstr "Pad:"
 
-#: rapid/preferencesdialog.py:1082
+#: rapid/preferencesdialog.py:1092
 msgid "Job Code"
 msgstr "Job Code"
 
-#: rapid/preferencesdialog.py:1353
+#: rapid/preferencesdialog.py:1363
 msgid "Select a folder in which to backup photos"
 msgstr "Selecteer een map waar foto's naar toe gebackuped moeten worden"
 
-#: rapid/preferencesdialog.py:1366
+#: rapid/preferencesdialog.py:1376
 msgid "Select a folder in which to backup videos"
 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
+#: rapid/preferencesdialog.py:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -973,7 +1008,7 @@ msgstr ""
 "<i><b>Opgepast:</b> Er is onvoldoende metadata om een volledige naam aan te "
 "maken. Gelieve andere hernoemings opties te gebruiken.</i>"
 
-#: rapid/preferencesdialog.py:1512
+#: rapid/preferencesdialog.py:1524
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -982,13 +1017,13 @@ msgstr ""
 "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
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Voorbeeld: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1605
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -999,7 +1034,7 @@ msgstr ""
 "gebruikt worden.\n"
 "Ze zullen naar de standaard waardes worden teruggezet."
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1762
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -1010,7 +1045,7 @@ msgstr ""
 "tenzij ze verbeterd worden:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1752
+#: rapid/preferencesdialog.py:1764
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -1021,17 +1056,17 @@ msgstr ""
 "tenzij ze verbeterd wordt:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1753
+#: rapid/preferencesdialog.py:1765
 msgid "Invalid regular expression"
 msgstr "Ongeldige reguliere expressie"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1934
+#: rapid/preferencesdialog.py:1949
 msgid "externaldrive1"
 msgstr "extern apparaat 1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1936
+#: rapid/preferencesdialog.py:1951
 msgid "externaldrive2"
 msgstr "extern apparaat 2"
 
@@ -1108,55 +1143,60 @@ msgid "Stockholm"
 msgstr "Stockholm"
 
 #. components
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:358
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
 msgstr "submap"
 
-#: rapid/problemnotification.py:28 rapid/subfolderfile.py:356
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr "bestandsnaam"
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr "Datum tijd waarde %s blijkt ongeldig te zijn."
 
-#: rapid/problemnotification.py:82
+#: rapid/problemnotification.py:86
 msgid "Filename does not have an extension."
 msgstr "Bestandsnaam heeft geen extentie."
 
 #. a number component is something like the 8346 in IMG_8346.JPG
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:88
 msgid "Filename does not have a number component."
 msgstr "Bestandsnaam bevat geen getallenreeks."
 
-#: rapid/problemnotification.py:85
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr "Fout bij het aanmaken van component %s."
 
 #. a generic problem
-#: rapid/problemnotification.py:87
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr "%(filetype)s metadata kan niet gelezen worden"
 
-#: rapid/problemnotification.py:89
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "%(filetype)s %(area)s kon niet aangemaakt worden"
 
-#: rapid/problemnotification.py:91 rapid/problemnotification.py:92
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr "Er is een fout gebeurd tijdens het kopiëren van de %(filetype)s"
 
-#: rapid/problemnotification.py:94 rapid/problemnotification.py:95
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr "%(filetype)s is niet correct gedownload"
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "%(filetype)s bestaat reeds"
 
-#: rapid/problemnotification.py:98
+#: rapid/problemnotification.py:105
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1165,7 +1205,7 @@ msgstr ""
 "%(filetype)s konden niet gebackupped worden omdat er geen gepaste backup "
 "plaats gevonden werd."
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:110
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -1174,12 +1214,12 @@ msgstr ""
 "%(image1)s werd genomen op %(image1_date)s om %(image1_time)s, en %(image2)s "
 "op %(image2_date)s om %(image2_time)s."
 
-#: rapid/problemnotification.py:104
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "%(filetype)s werd eerder al gebackupped"
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:115
 #, python-format
 msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
@@ -1188,27 +1228,34 @@ msgstr ""
 "De bestaande %(filetype)s werd laatst aangepast op %(date)s om %(time)s. "
 "Uniek identificatienummer '%(identifier)s' toegevoegd."
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:116
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 "De bestaande %(filetype)s werd laatst aangepast op %(date)s om %(time)s."
 
-#: rapid/problemnotification.py:110
+#: rapid/problemnotification.py:117
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr "Er zijn geen gegevens om de %(filetype)s een naam te geven."
 
-#: rapid/problemnotification.py:112
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Fout: %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:202
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+"Bestandscontrole mislukt. De gedownloade versie verschilt van de originele."
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr "De metadata kan beschadigd zijn."
 
-#: rapid/problemnotification.py:205
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
@@ -1216,28 +1263,28 @@ msgstr ""
 "De bestandsnaam, extentie en Exif informatie geven aan dat het reeds "
 "gedownload werd."
 
-#: rapid/problemnotification.py:224
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " Het werd gebackupped naar %(volume)s"
 
-#: rapid/problemnotification.py:226
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr " Het werd gebackupped naar deze apparaten: "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:229 rapid/problemnotification.py:290
-#: rapid/problemnotification.py:302
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s en %(final_volume)s."
 
-#: rapid/problemnotification.py:241
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
@@ -1246,263 +1293,316 @@ msgstr ""
 "Foto's ontdekt met dezelfde bestandsnamen maar genomen op verschillende "
 "tijden: %(details)s"
 
-#: rapid/problemnotification.py:258
+#: rapid/problemnotification.py:269
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr "Een fout gebeurde tijdens het backuppen naar %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:260
+#: rapid/problemnotification.py:271
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr "Een fout gebeurde tijdens het backuppen naar %(volume)s."
 
-#: rapid/problemnotification.py:262
+#: rapid/problemnotification.py:273
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr "Fouten gebeurden tijdens het backuppen naar de volgende apparaten: "
 
-#: rapid/problemnotification.py:266 rapid/problemnotification.py:314
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:268
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:272 rapid/problemnotification.py:316
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr "%(volumes)s en %(volume)s (%(inst)s)."
 
-#: rapid/problemnotification.py:277
+#: rapid/problemnotification.py:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s en %(volume)s."
 
-#: rapid/problemnotification.py:285
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "Backup bestaat reeds op %(volume)s."
 
-#: rapid/problemnotification.py:287
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr "Backups bestaan reeds op volgende plaatsen: "
 
-#: rapid/problemnotification.py:297
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "Backup overschreven op %(volume)s."
 
-#: rapid/problemnotification.py:299
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr "Backups overschreven op deze apparaten: "
 
-#: rapid/problemnotification.py:310
+#: rapid/problemnotification.py:321
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr ""
 "Een fout gebeurde tijdens het aanmaken van mappen op %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:312
+#: rapid/problemnotification.py:323
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 "Fouten gebeurden tijdens het aanmaken van mappen op de volgende backup "
 "apparaten: "
 
-#: rapid/problemnotification.py:323
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+"Bestandscontrole mislukt op %(volume)s. De gebackupde versie verschilt van "
+"de gedownloade."
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr "Bestandscontrole mislukt op deze apparaten: "
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "%(previousproblem)s Bovenop, %(newproblem)s"
 
-#: rapid/problemnotification.py:331
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " Daarenboven waren er %(problems)s."
 
-#: rapid/problemnotification.py:333
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " Daarenboven was er een %(problem)s."
 
-#: rapid/problemnotification.py:342
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "De %(type)s metadata ontbreekt."
 
-#: rapid/problemnotification.py:344
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr "De volgende metadata ontbreekt: "
 
-#: rapid/problemnotification.py:347
+#: rapid/problemnotification.py:371
 #, python-format
 msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr "%(missing_metadata_elements)s en %(final_missing_metadata_element)s."
 
-#: rapid/problemnotification.py:364
+#: rapid/problemnotification.py:388
 msgid "Problems in subfolder and filename generation"
 msgstr "Problemen bij het aanmaken van de submappen en bestandsnamen"
 
-#: rapid/problemnotification.py:366
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr "Probleen bij het aanmaken van de submappen en bestandsnamen"
 
-#: rapid/problemnotification.py:369
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Problemen bij het aanmaken van %s"
 
-#: rapid/problemnotification.py:371
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Probleem bij het aanmaken van %s"
 
-#: rapid/problemnotification.py:380
+#: rapid/problemnotification.py:404
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr "%(filetype)s bestaat reeds, maar het was gebackupped"
 
-#: rapid/problemnotification.py:382
+#: rapid/problemnotification.py:406
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 "Een fout gebeurde bij het kopiëren van %(filetype)s, maar het was gebackupped"
 
-#: rapid/problemnotification.py:402
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr "Meerdere problemen tegengekomen"
 
-#: rapid/problemnotification.py:404 rapid/subfolderfile.py:233
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 "Foto's gevonden met dezelfde bestandsnaam, maar op een verschillend tijdstip "
 "genomen"
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr "er waren fouten tijdens het backuppen"
 
-#: rapid/problemnotification.py:411
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr "Er waren fouten tijdens het backuppen"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr "er was een fout tijdens het backuppen"
 
-#: rapid/problemnotification.py:414
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr "Er was een fout tijdens het backuppen"
 
 #. e.g.
-#: rapid/problemnotification.py:417
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, en %(backinguperror)s"
 
-#: rapid/rpdfile.py:153
+#: rapid/rpdfile.py:159
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/rpdfile.py:163
+#: rapid/rpdfile.py:169
 #, 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
+#: rapid/subfolderfile.py:81
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr "submap en bestandsnaam"
+
+#: rapid/subfolderfile.py:406
 msgid "Photo has already been downloaded"
 msgstr "Foto werd al eens gedownload"
 
-#: rapid/subfolderfile.py:302
+#: rapid/subfolderfile.py:407
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Bron: %(source)s"
 
-#: rapid/subfolderfile.py:354
-msgid "subfolder and filename"
-msgstr "submap en bestandsnaam"
-
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:485
 msgid "Failed to create download subfolder"
 msgstr "Kon downloadmap niet aanmaken"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:486
 #, python-format
 msgid "Path: %s"
 msgstr "Pad: %s"
 
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr "Over..."
+
 #: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
+msgstr "Alles _aanvinken"
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr "Controlleer all foto's"
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr "Controlleer alle video's"
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "_Doe een gift..."
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr "_Online Help..."
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr "Help"
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
+msgstr "Voorkeuren"
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
+msgstr "Afsluiten"
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
+msgstr "Verversen"
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr "_Rapporteer een probleem..."
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
+msgstr "Vertaal deze Toepassing..."
+
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr "Alles _uitvinken"
+
+#: rapid/glade3/rapid.ui.h:16
 msgid "_File"
 msgstr "_Bestand"
 
-#: rapid/glade3/rapid.ui.h:3
+#: rapid/glade3/rapid.ui.h:17
 msgid "Download / Pause"
 msgstr "Download / Pauze"
 
-#: rapid/glade3/rapid.ui.h:4
+#: rapid/glade3/rapid.ui.h:18
 msgid "_Select"
 msgstr "_Selecteer"
 
-#: rapid/glade3/rapid.ui.h:5
+#: rapid/glade3/rapid.ui.h:19
 msgid "Select All Without _Job Code"
 msgstr "Selecteer Alle Zonder _Job Code"
 
-#: rapid/glade3/rapid.ui.h:6
+#: rapid/glade3/rapid.ui.h:20
 msgid "Select All Wit_h Job Code"
 msgstr "Selecteer Alle _met Job Code"
 
-#: rapid/glade3/rapid.ui.h:7
+#: rapid/glade3/rapid.ui.h:21
 msgid "_View"
 msgstr "_Weergave"
 
-#: rapid/glade3/rapid.ui.h:8
+#: rapid/glade3/rapid.ui.h:22
 msgid "_Error Log"
 msgstr "_Fouten log"
 
-#: rapid/glade3/rapid.ui.h:9
+#: rapid/glade3/rapid.ui.h:23
 msgid "_Clear Completed Downloads"
 msgstr "_Verwijder Afgewerkte Downloads"
 
-#: rapid/glade3/rapid.ui.h:10
+#: rapid/glade3/rapid.ui.h:24
 msgid "Previous File"
 msgstr "Vorig Bestand"
 
-#: rapid/glade3/rapid.ui.h:11
+#: rapid/glade3/rapid.ui.h:25
 msgid "Next File"
 msgstr "Volgend Bestand"
 
-#: rapid/glade3/rapid.ui.h:12
+#: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
 msgstr "_Help"
 
-#: rapid/glade3/rapid.ui.h:13
-msgid "_Make a Donation..."
-msgstr "_Doe een gift..."
-
-#: rapid/glade3/rapid.ui.h:14
+#: rapid/glade3/rapid.ui.h:27
 msgid "_Translate this Application..."
 msgstr "_Vertaal deze Toepassing"
 
-#: rapid/glade3/rapid.ui.h:15
-msgid "_Check All"
-msgstr "Alles _aanvinken"
-
-#: rapid/glade3/rapid.ui.h:16
-msgid "_Uncheck All"
-msgstr "Alles _uitvinken"
-
-#: rapid/glade3/rapid.ui.h:17
+#: rapid/glade3/rapid.ui.h:28
 msgid "_Include in download"
 msgstr "_In download meenemen"
 
-#: rapid/glade3/rapid.ui.h:18
+#: rapid/glade3/rapid.ui.h:29
 msgid "_Download"
 msgstr "_Downloaden"
 
@@ -1581,8 +1681,8 @@ msgid ""
 "for python, or <i>exiftool</i>."
 msgstr ""
 "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."
+"downloaden moet je ofwel de  <i>hachoir metadata</i> en de <i>kaa "
+"metadata</i> paketten voor python, ofwel <i>exiftool</i> installeren."
 
 #: rapid/glade3/prefs.ui.h:18
 msgid ""
@@ -1702,8 +1802,8 @@ msgid ""
 "\n"
 "<i>Downloading directly from cameras is currently an experimental feature. "
 "If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, a card reader must be used."
-"</i>"
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
 msgstr ""
 "Met apparaten wordt bedoeld waar je de foto's en video's van downloadt, "
 "zoals camera's, geheugenkaarten of Draagbare Opslagmedia.\n"
@@ -1804,7 +1904,8 @@ msgid "<b>Backup</b>"
 msgstr "<b>Backup</b>"
 
 #: rapid/glade3/prefs.ui.h:66
-msgid "If you disable automatic detection, choose the exact backup locations."
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 "Als je de automatische herkenning uitzet, moet je een exacte backup locatie "
 "ingeven."
@@ -1822,7 +1923,7 @@ msgstr ""
 "gedownload worden, bv. externe harde schijven."
 
 #: rapid/glade3/prefs.ui.h:69
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr "Backup foto's en video's gedurende het downloaden"
 
 #: rapid/glade3/prefs.ui.h:70
@@ -1865,8 +1966,8 @@ msgid "Video backup location:"
 msgstr "Video backup locatie:"
 
 #: rapid/glade3/prefs.ui.h:79
-msgid "Backup"
-msgstr "Backup"
+msgid "Back up"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:80
 msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
@@ -1901,35 +2002,39 @@ msgstr ""
 msgid "Automatically rotate JPEG images"
 msgstr "Automatisch JPEG beelden roteren"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr "Controleer bestanden tijdens het downloaden"
+
+#: rapid/glade3/prefs.ui.h:90
 msgid "Performance"
 msgstr "Prestatie"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:91
 msgid "Generate thumbnails (slower)"
 msgstr "Aanmaken miniatuur (trager)"
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:92
 msgid "Miscellaneous"
 msgstr "Overige"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Foutverwerking</span>"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Foto- en Videonaam conflict</b>"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Add unique identifier"
 msgstr "Unieke identifieteken toevoegen"
 
-#: rapid/glade3/prefs.ui.h:94
+#: rapid/glade3/prefs.ui.h:96
 msgid "Skip download"
 msgstr "Download overslaan"
 
-#: rapid/glade3/prefs.ui.h:95
+#: rapid/glade3/prefs.ui.h:97
 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."
@@ -1938,7 +2043,7 @@ msgstr ""
 "om het downloaden van dit bestand over te slaan of om er een uniek "
 "identificatieteken aan toe te voegen."
 
-#: rapid/glade3/prefs.ui.h:96
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1946,15 +2051,15 @@ msgstr ""
 "Kies om het bestand op het backupapparaat met dezelfde naam te "
 "overschrijven, of over te slaan, gedurende de backup."
 
-#: rapid/glade3/prefs.ui.h:97
+#: rapid/glade3/prefs.ui.h:99
 msgid "Overwrite"
 msgstr "Overschrijven"
 
-#: rapid/glade3/prefs.ui.h:98
+#: rapid/glade3/prefs.ui.h:100
 msgid "Skip"
 msgstr "Overslaan"
 
-#: rapid/glade3/prefs.ui.h:99
+#: rapid/glade3/prefs.ui.h:101
 msgid "Error Handling"
 msgstr "Foutafhandeling"
 
@@ -1976,12 +2081,13 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ "Please check preferences, restart the program, and try again."
 #~ msgstr ""
 #~ "\n"
-#~ "Gelieve de voorkeuren te controleren, het programma te herstarten en "
-#~ "opnieuw te proberen."
+#~ "Gelieve de voorkeuren te controleren, het programma te herstarten en opnieuw "
+#~ "te proberen."
 
 #~ msgid "There is an error in the program preferences."
 #~ msgstr "Er is een fout in de programma voorkeuren."
 
+#, python-format
 #~ msgid "0 of %s images copied"
 #~ msgstr "0 van %s afbeeldingen gekopieerd"
 
@@ -1991,16 +2097,19 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgid "Resetting to midnight.\n"
 #~ msgstr "Terugzetten op middernacht.\n"
 
+#, python-format
 #~ msgid "Device scan complete: found %(number)s images on %(device)s"
 #~ msgstr ""
 #~ "Apparaat scan afgelopen: %(number)s afbeeldingen gevonden op %(device)s"
 
+#, python-format
 #~ msgid "Device scan complete: no images found on %s"
 #~ msgstr "Apparaat scan afgelopen: geen afbeeldingen gevonden op %s"
 
 #~ msgid "Image filename could not be generated"
 #~ msgstr "Afbeeldingsnaam kon niet aangemaakt worden"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Problem: %(problem)s"
@@ -2012,9 +2121,10 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ "Image filename could not be properly generated. Check to ensure there is "
 #~ "sufficient image metadata."
 #~ msgstr ""
-#~ "Afbeeldingsnaam kon niet goed aangemaakt worden. Controlleer of er "
-#~ "voldoende afbeeldingsmetadata aanwezig is."
+#~ "Afbeeldingsnaam kon niet goed aangemaakt worden. Controlleer of er voldoende "
+#~ "afbeeldingsmetadata aanwezig is."
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s\n"
@@ -2027,18 +2137,21 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgid "Could not open image"
 #~ msgstr "Kon afbeelding niet openen"
 
+#, python-format
 #~ msgid "Source: %s"
 #~ msgstr "Bron: %s"
 
 #~ msgid "Image has no metadata"
 #~ msgstr "Afbeelding heeft geen metadata"
 
+#, python-format
 #~ msgid "Unique identifier '%s' added"
 #~ msgstr "Unieke identifier '%s' toegevoegd"
 
 #~ msgid "Download copying error"
 #~ msgstr "Download kopieer fout"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s\n"
@@ -2054,6 +2167,7 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgid "Backup image already exists"
 #~ msgstr "Backup afbeelding bestaat al"
 
+#, python-format
 #~ msgid ""
 #~ "Destination directory could not be created\n"
 #~ "%(directory)s\n"
@@ -2063,6 +2177,7 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ "%(directory)s\n"
 #~ "Fout: %(errno)s %(strerror)s"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s\n"
@@ -2075,9 +2190,11 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgid "The device can now be safely removed"
 #~ msgstr "Het apparaat kan nu veilig verwijderd worden"
 
+#, python-format
 #~ msgid "%s images downloaded"
 #~ msgstr "%s afbeeldingen gedownload"
 
+#, python-format
 #~ msgid "%s images skipped"
 #~ msgstr "%s afbeeldingen overgeslaan"
 
@@ -2087,6 +2204,7 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgid "Backup device missing"
 #~ msgstr "Backup apparaat afwezig"
 
+#, python-format
 #~ msgid "Download has started from %s"
 #~ msgstr "Download begonnen vanaf %s"
 
@@ -2102,6 +2220,7 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgid "Image has no thumbnail"
 #~ msgstr "Afbeelding heeft geen miniatuur"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s images copied"
 #~ msgstr "%(number)s van %(total)s afbeeldingen gekopieerd"
 
@@ -2111,21 +2230,21 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgid "It may be corrupted"
 #~ msgstr "Het kan corrupt zijn"
 
+#, python-format
 #~ msgid "%s selected for downloading from"
 #~ msgstr "%s aangeduid om gedownload te worden van"
 
 #~ msgid "This device or partition will always be used to download from"
 #~ msgstr ""
-#~ "Dit apparaat of deze partitie zal altijd gebruikt worden om van te "
-#~ "downloaden"
+#~ "Dit apparaat of deze partitie zal altijd gebruikt worden om van te downloaden"
 
+#, python-format
 #~ msgid "%s rejected as a download device"
 #~ msgstr "%s afgewezen als download apparaat"
 
 #~ msgid "This device or partition will never be used to download from"
 #~ msgstr ""
-#~ "Dit apparaat of deze partitie zal nooit gebruikt worden om van te "
-#~ "downloaden"
+#~ "Dit apparaat of deze partitie zal nooit gebruikt worden om van te downloaden"
 
 #~ msgid "Enter a new job code."
 #~ msgstr "Geef een nieuwe job code."
@@ -2139,6 +2258,7 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgid "Some preferences will be reset."
 #~ msgstr "Sommige voorkeuren worden gereset"
 
+#, python-format
 #~ msgid "Prompting whether to use %s"
 #~ msgstr "Vragen om %s te gebruiken"
 
@@ -2176,8 +2296,8 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgstr "Voorkeuren werden aangepast."
 
 #~ msgid ""
-#~ "This version of the program uses different preferences than the old "
-#~ "version. Your preferences have been updated.\n"
+#~ "This version of the program uses different preferences than the old version. "
+#~ "Your preferences have been updated.\n"
 #~ "\n"
 #~ "Please check them to ensure correct operation."
 #~ msgstr ""
@@ -2195,9 +2315,11 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgid "Failed to receive pynotify server capabilities."
 #~ msgstr "Kon de pynotify server mogelijkheden niet ontvangen."
 
+#, python-format
 #~ msgid "Device %(device)s (%(path)s) ignored"
 #~ msgstr "Apparaat %(device)s (%(path)s) wordt genegeerd"
 
+#, python-format
 #~ msgid "Detected %(device)s with path %(path)s"
 #~ msgstr "Detecteerde %(device)s met als pad %(path)s"
 
@@ -2216,21 +2338,25 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgid "Using"
 #~ msgstr "Gebruik makend van"
 
+#, python-format
 #~ msgid "%s is already running"
 #~ msgstr "%s is al draaiende"
 
+#, python-format
 #~ msgid "Preference value '%(value)s' is invalid"
 #~ msgstr "Voorkeurwaarde '%(value)s' is ongeldig"
 
 #~ msgid "_Pause"
 #~ msgstr "_Pauze"
 
+#, python-format
 #~ msgid "Error in date time component. Value %s appears invalid"
 #~ msgstr "Fout in datum/tijd component. Waarde %s blijkt ongeldig"
 
 #~ msgid "extension was specified but image name has no extension"
 #~ msgstr "Uitbreiding was gespecifieerd, maar afbeeldingsnaam heeft er geen"
 
+#, python-format
 #~ msgid "error generating name with component %s"
 #~ msgstr "fout bij het aanmaken van de naam met component %s"
 
@@ -2249,9 +2375,11 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgid "Automation"
 #~ msgstr "Automatisering"
 
+#~ msgid "Backup"
+#~ msgstr "Backup"
+
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Afbeelding Hernoemen</span>\t"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Afbeelding Hernoemen</span>\t"
 
 #~ msgid "Copyright Damon Lynch 2007-09"
 #~ msgstr "Copyright Damon Lynch 2007-09"
@@ -2262,11 +2390,9 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgid "Image Devices"
 #~ msgstr "Afbeeldingsapparaat"
 
-#~ msgid ""
-#~ "If you disable automatic detection, choose the exact backup location."
+#~ msgid "If you disable automatic detection, choose the exact backup location."
 #~ msgstr ""
-#~ "Als je de automatische herkenning uitschakelt, kies de juiste backup "
-#~ "plaats."
+#~ "Als je de automatische herkenning uitschakelt, kies de juiste backup plaats."
 
 #~ msgid "Exit program after completion of successful download"
 #~ msgstr "Verlaat programma na het beëindigen van een gelukte download"
@@ -2275,11 +2401,10 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgstr "Negeren"
 
 #~ msgid ""
-#~ "If you disable automatic detection, choose the exact location of the "
-#~ "images."
+#~ "If you disable automatic detection, choose the exact location of the images."
 #~ msgstr ""
-#~ "Als je de automatische herkenning uitschakelt, kies de juiste plaats voor "
-#~ "de afbeeldingen."
+#~ "Als je de automatische herkenning uitschakelt, kies de juiste plaats voor de "
+#~ "afbeeldingen."
 
 #~ msgid "Error Log"
 #~ msgstr "Foutenlog"
@@ -2303,8 +2428,8 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ "Specify what to do when an image of the same name has already been "
 #~ "downloaded or backed up."
 #~ msgstr ""
-#~ "Specifieer wat er dient te gebeuren indien een afbeelding met dezelfde "
-#~ "naam reeds gedownload of gebackupped was."
+#~ "Specifieer wat er dient te gebeuren indien een afbeelding met dezelfde naam "
+#~ "reeds gedownload of gebackupped was."
 
 #~ msgid "Unmount (\"eject\") image device upon download completion"
 #~ msgstr "Ontkoppel (\"verwijder\") het afbeeldingsapparaat na de download"
@@ -2313,18 +2438,12 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ "You can have your photos backed up to multiple locations as they are "
 #~ "downloaded, e.g. external hard drives."
 #~ msgstr ""
-#~ "Je kan je foto's op meerdere plaatsen backuppen tijdens het downloaden, "
-#~ "bv. externe harde schijven."
-
-#~ msgid "_Get Help Online..."
-#~ msgstr "_Online Help..."
+#~ "Je kan je foto's op meerdere plaatsen backuppen tijdens het downloaden, bv. "
+#~ "externe harde schijven."
 
 #~ msgid "Start downloading upon image device insertion"
 #~ msgstr "Start de download zodra het afbeeldingsapparaat aangekoppeld wordt"
 
-#~ msgid "_Report a Problem..."
-#~ msgstr "_Rapporteer een probleem..."
-
 #~ msgid "_Photos"
 #~ msgstr "_Foto's"
 
@@ -2332,8 +2451,7 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgstr "_Miniaturen"
 
 #~ msgid ""
-#~ "Choose whether to skip downloading the image, or to add a unique "
-#~ "indentifier."
+#~ "Choose whether to skip downloading the image, or to add a unique indentifier."
 #~ msgstr ""
 #~ "Kies tussen het overslaan van de download van de afbeelding, of er een "
 #~ "unieke identifier aan toe te kennen."
@@ -2343,9 +2461,9 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ "device will be scanned for images. On large devices, this could take some "
 #~ "time."
 #~ msgstr ""
-#~ "Als je de automatische herkenning van Draagbare Opslagmedia inschakelt, "
-#~ "zal het volledig apparaat gescanned worden op afbeeldingen. Bij grote "
-#~ "apparaten, kan dat een tijd duren."
+#~ "Als je de automatische herkenning van Draagbare Opslagmedia inschakelt, zal "
+#~ "het volledig apparaat gescanned worden op afbeeldingen. Bij grote apparaten, "
+#~ "kan dat een tijd duren."
 
 #~ msgid ""
 #~ "Image devices are devices from which to download photos, such as cameras, "
@@ -2353,9 +2471,9 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ "\n"
 #~ "You can download photos from multiple image devices simultaneously.\n"
 #~ "\n"
-#~ "<i>If downloading directly from your camera works poorly or not at all, "
-#~ "try setting it to PTP mode. If that is not possible, consider using a "
-#~ "card reader.</i>"
+#~ "<i>If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, consider using a card "
+#~ "reader.</i>"
 #~ msgstr ""
 #~ "Afbeeldingsapparaten zijn apparaten waar we foto's van kunnen downloaden "
 #~ "zoals camera's, geheugenkaarten en draagbare opslagmedia.\n"
@@ -2363,12 +2481,12 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ "Je kunt foto's van meerdere afbeeldingsapparaten simultaan downloaden.\n"
 #~ "\n"
 #~ "<i>Indien het rechtstreeks downloaden vanaf je camera slecht of helemaal "
-#~ "niet werkt, probeer het via de PTP mode. Als dat niet mogelijk is "
-#~ "overweeg een kaartlezer te gebruiken.</i>"
+#~ "niet werkt, probeer het via de PTP mode. Als dat niet mogelijk is overweeg "
+#~ "een kaartlezer te gebruiken.</i>"
 
 #~ msgid ""
-#~ "When backing up, choose whether to overwrite an image on the backup "
-#~ "device that has the same name, or skip backing it up."
+#~ "When backing up, choose whether to overwrite an image on the backup device "
+#~ "that has the same name, or skip backing it up."
 #~ msgstr ""
 #~ "Kies tijdens het backuppen om een afbeelding met dezelfde naam op het "
 #~ "backupapparaat te overschrijven of over te slaan."
@@ -2392,8 +2510,7 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ "The subfolder preferences entered are invalid and cannot be used.\n"
 #~ "They will be reset to their default values."
 #~ msgstr ""
-#~ "De ingevulde submapvoorkeuren zijn ongeldig en kunnen niet gebruikt "
-#~ "worden.\n"
+#~ "De ingevulde submapvoorkeuren zijn ongeldig en kunnen niet gebruikt worden.\n"
 #~ "Ze zullen naar de standaard waardes worden teruggezet."
 
 #~ msgid "The subfolder preferences had some unnecessary values removed."
@@ -2404,17 +2521,17 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
 #~ "the name. Please use other renaming options.</i>"
 #~ msgstr ""
-#~ "<i><b>Opgepast:</b> Er is onvoldoende afbeeldingsmetadata om een "
-#~ "volledige naam aan te maken. Gelieve andere hernoemingsopties te "
-#~ "gebruiken.</i>"
+#~ "<i><b>Opgepast:</b> Er is onvoldoende afbeeldingsmetadata om een volledige "
+#~ "naam aan te maken. Gelieve andere hernoemingsopties te gebruiken.</i>"
 
 #~ msgid ""
 #~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
 #~ "subfolders. Please use other subfolder naming options.</i>"
 #~ msgstr ""
-#~ "<i><b>Opgepast:</b> Er is onvoldoende afbeeldingsmetadata om een submap "
-#~ "aan te maken. Gelieve andere submap benoemingsopties te gebruiken.</i>"
+#~ "<i><b>Opgepast:</b> Er is onvoldoende afbeeldingsmetadata om een submap aan "
+#~ "te maken. Gelieve andere submap benoemingsopties te gebruiken.</i>"
 
+#, python-format
 #~ msgid ""
 #~ "Metadata is essential for generating subfolders / image names.\n"
 #~ "Source: %s"
@@ -2433,6 +2550,7 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ "Submapnaam kon niet goed aangemaakt worden. Controlleer of er voldoende "
 #~ "afbeeldingsmetadata aanwezig is."
 
+#, python-format
 #~ msgid ""
 #~ "Subfolder: %(subfolder)s\n"
 #~ "Image: %(image)s\n"
@@ -2448,6 +2566,7 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgid "This device has no images to download from."
 #~ msgstr "Dit apparaat bevat geen afbeeldingen die gedownload kunnen worden."
 
+#, python-format
 #~ msgid "Download complete from %s"
 #~ msgstr "Download van %s afgelopen"
 
@@ -2463,9 +2582,9 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgstr "Waarschuwing:"
 
 #~ msgid ""
-#~ "This version of the program uses different preferences than the old "
-#~ "version. Some of your previous preferences were invalid, and could not be "
-#~ "updated. They will be reset."
+#~ "This version of the program uses different preferences than the old version. "
+#~ "Some of your previous preferences were invalid, and could not be updated. "
+#~ "They will be reset."
 #~ msgstr ""
 #~ "Deze versie van het programma gebruikt andere voorkeuren dan de vorige. "
 #~ "Bepaalde van je vorige voorkeuren zijn ongeldig en kunnen niet aangepast "
@@ -2479,9 +2598,9 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 
 #~ msgid "list image file extensions the program recognizes and exit"
 #~ msgstr ""
-#~ "toon een lijst van bestandextenties welke het programma herkent en keer "
-#~ "terug"
+#~ "toon een lijst van bestandextenties welke het programma herkent en keer terug"
 
+#, python-format
 #~ msgid ""
 #~ "Preference key '%(key)s' is invalid.\n"
 #~ "Expected one of %(value)s"
@@ -2492,6 +2611,7 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgid "Subsecond metadata not present in image"
 #~ msgstr "Subsecond metadata niet aanwezig in de afbeelding"
 
+#, python-format
 #~ msgid "%s metadata is not present in image"
 #~ msgstr "%s metadata is niet aanwezig in de afbeelding"
 
@@ -2525,19 +2645,18 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 
 #~ msgid ""
 #~ "Rapid Photo Downloader is free software; you can redistribute it and/or "
-#~ "modify it under the terms of the GNU General Public License as published "
-#~ "by the Free Software Foundation; either version 2 of the License, or (at "
-#~ "your option) any later version.\n"
+#~ "modify it under the terms of the GNU General Public License as published by "
+#~ "the Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
 #~ "\n"
 #~ "Rapid Photo Downloader is distributed in the hope that it will be useful, "
 #~ "but WITHOUT ANY WARRANTY; without even the implied warranty of "
 #~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
 #~ "Public License for more details.\n"
 #~ "\n"
-#~ "You should have received a copy of the GNU General Public License along "
-#~ "with Rapid Photo Downloader; if not, write to the Free Software "
-#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
-#~ "USA."
+#~ "You should have received a copy of the GNU General Public License along with "
+#~ "Rapid Photo Downloader; if not, write to the Free Software Foundation, Inc., "
+#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 #~ msgstr ""
 #~ "Rapid Photo Downloader is vrije software; je mag het herverdelen en/of  "
 #~ "aanpassen onder de termen van de GNU General Public License zoals "
@@ -2546,13 +2665,13 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ "\n"
 #~ "Rapid Photo Downloader wordt verdeeld in de hoop dat het nuttig zal zijn, "
 #~ "maar ZONDER ENIGE GARANTIE; zelfs zonder de impliciete garantie van  "
-#~ "VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL . Zie de GNU "
-#~ "General Public License voor meer details.\n"
+#~ "VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL . Zie de GNU General "
+#~ "Public License voor meer details.\n"
 #~ "\n"
-#~ "Je zou een kopie van de GNU General Public License ontvangen moeten "
-#~ "hebben samen met Rapid Photo Downloader; indien niet, contacteer de Free "
-#~ "Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-#~ "02110-1301, USA."
+#~ "Je zou een kopie van de GNU General Public License ontvangen moeten hebben "
+#~ "samen met Rapid Photo Downloader; indien niet, contacteer de Free Software "
+#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
+#~ "USA."
 
 #~ msgid "Specify what to do when there are no backup devices."
 #~ msgstr ""
@@ -2562,8 +2681,8 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ "Specify the folder in which backups are stored on the device.  \n"
 #~ "\n"
 #~ "<i>Note: this will also be used to determine whether or not the device is "
-#~ "used for backups. For each device you wish to use for backing up to, "
-#~ "create a folder in it with this name.</i>"
+#~ "used for backups. For each device you wish to use for backing up to, create "
+#~ "a folder in it with this name.</i>"
 #~ msgstr ""
 #~ "Specifieer de map waar de backups opgeslagen zijn op het apparaat.  \n"
 #~ "\n"
diff --git a/po/nn.po b/po/nn.po
index 342e8a0..656f7c6 100644
--- a/po/nn.po
+++ b/po/nn.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 08:52+0000\n"
-"Last-Translator: Kevin Brubeck Unhammer <Unknown>\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:14+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-28 07:56+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\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:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:112
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:114
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:127
 #, 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:162
 msgid "Device"
 msgstr "Eining"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:170
+#: rapid/rapid.py:180
 msgid "Size"
 msgstr "Storleik"
 
-#: rapid/rapid.py:173
+#: rapid/rapid.py:183
 msgid "Download Progress"
 msgstr "Nedlastingsframgang"
 
-#: rapid/rapid.py:319
+#: rapid/rapid.py:343
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s vart ikkje avmontert"
@@ -66,22 +66,22 @@ msgstr "%(device)s vart ikkje avmontert"
 #. 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:1241
 msgid "scanning..."
 msgstr "leiter..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1697
+#: rapid/rapid.py:1818
 msgid "the root of the file system"
 msgstr "rotmappa til filsystemet"
 
 #. 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:1822
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Lastar ned frå %(location)s."
 
-#: rapid/rapid.py:1702
+#: rapid/rapid.py:1823
 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 verkeleg lasta ned herfrå? På visse system kan det ta veldig lang tid "
 "å skanna dette."
 
-#: rapid/rapid.py:2124 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr "Last ned"
 
-#: rapid/rapid.py:2127
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr "Pause"
 
-#: rapid/rapid.py:2228
+#: rapid/rapid.py:2376
 #, 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:2379
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -117,176 +117,187 @@ msgstr ""
 "Mappa er ugyldig:\n"
 "%s"
 
-#: rapid/rapid.py:2232
+#: rapid/rapid.py:2380
 msgid "Download cannot proceed"
 msgstr "Kan ikkje gå vidare med nedlasting"
 
-#: rapid/rapid.py:2559
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "bilete"
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "videoar"
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr ""
+
+#: rapid/rapid.py:2802
 msgid "About 1 second remaining"
 msgstr "Omtrent eitt sekund igjen"
 
-#: rapid/rapid.py:2561
+#: rapid/rapid.py:2804
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Omtrent %i sekund igjen"
 
-#: rapid/rapid.py:2563
+#: rapid/rapid.py:2806
 msgid "About 1 minute remaining"
 msgstr "Omtrent eitt 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:2568
+#: rapid/rapid.py:2811
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Omtrent %(minutes)i minutt og %(seconds)02i sekund igjen"
 
-#: rapid/rapid.py:2590 rapid/rpdfile.py:113
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
 msgid "photos and videos"
 msgstr "bilete og videoar"
 
-#: rapid/rapid.py:2592 rapid/rpdfile.py:115
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
 msgid "photos or videos"
 msgstr "bilete eller videoar"
 
-#: rapid/rapid.py:2595 rapid/rapid.py:3408 rapid/rpdfile.py:118
-msgid "videos"
-msgstr "videoar"
-
-#: rapid/rapid.py:2597 rapid/preferencesdialog.py:1617 rapid/rpdfile.py:120
-#: rapid/rpdfile.py:254
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
 msgid "video"
 msgstr "video"
 
-#: rapid/rapid.py:2600 rapid/rapid.py:3406 rapid/rpdfile.py:123
-msgid "photos"
-msgstr "bilete"
-
 #. 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:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
 msgid "photo"
 msgstr "bilete"
 
-#: rapid/rapid.py:2629
+#: rapid/rapid.py:2872
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "Lasta ned %(noFiles)s %(filetypes)s"
 
-#: rapid/rapid.py:2633
+#: rapid/rapid.py:2876
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "Klarte ikkje å laste ned %(noFiles)s %(filetypes)s"
 
-#: rapid/rapid.py:2636 rapid/rapid.py:2688
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
 msgid "warnings"
 msgstr "åtvaringar"
 
-#: rapid/rapid.py:2645
+#: rapid/rapid.py:2892
 msgid "All downloads complete"
 msgstr "Alle nedlastingar er ferdige"
 
-#: rapid/rapid.py:2651 rapid/rapid.py:2660 rapid/rapid.py:2669
-#: rapid/rapid.py:2678 rapid/rapid.py:2686
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2653 rapid/rapid.py:2671
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s lasta ned"
 
-#: rapid/rapid.py:2662 rapid/rapid.py:2680
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "Klarte ikkje å laste ned %(filetype)s"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2719
+#: rapid/rapid.py:2970
 #, 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:2726
+#: rapid/rapid.py:2977
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s av %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3072
+#: rapid/rapid.py:3331
 msgid "From"
 msgstr "Frå"
 
-#: rapid/rapid.py:3080
+#: rapid/rapid.py:3339
 msgid "Auto Detect"
 msgstr "Oppdag automatisk"
 
-#: rapid/rapid.py:3084 rapid/preferencesdialog.py:1324
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Vel ei mappe med %(file_types)s"
 
-#: rapid/rapid.py:3125
+#: rapid/rapid.py:3384
 msgid "Copy"
 msgstr "Kopier"
 
-#: rapid/rapid.py:3138
+#: rapid/rapid.py:3397
 msgid "Move"
 msgstr "Flytt"
 
-#: rapid/rapid.py:3160
+#: rapid/rapid.py:3419
 msgid "To"
 msgstr "Til"
 
-#: rapid/rapid.py:3167 rapid/rapid.py:3796
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
 msgid "Photos:"
 msgstr "Bilete:"
 
-#: rapid/rapid.py:3170 rapid/preferencesdialog.py:1161
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
 msgid "Select a folder to download photos to"
 msgstr "Vel ei mappe å laste inn bilete til"
 
-#: rapid/rapid.py:3182 rapid/rapid.py:3796
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
 msgid "Videos:"
 msgstr "Videoar:"
 
-#: rapid/rapid.py:3184 rapid/preferencesdialog.py:1179
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
 msgid "Select a folder to download videos to"
 msgstr "Vel ei mappe å laste inn video til"
 
-#: rapid/rapid.py:3376
+#: rapid/rapid.py:3650
 msgid "and"
 msgstr "og"
 
-#: rapid/rapid.py:3381
+#: rapid/rapid.py:3655
 msgid "Using backup devices"
 msgstr "Nyttar einingar for tryggleikskopiering"
 
-#: rapid/rapid.py:3383
+#: rapid/rapid.py:3657
 msgid "Using backup device"
 msgstr "Nyttar eining for tryggleikskopiering"
 
-#: rapid/rapid.py:3385
+#: rapid/rapid.py:3659
 msgid "No backup devices detected"
 msgstr "Fann ingen einingar for tryggleikskopiering"
 
-#: rapid/rapid.py:3412
+#: rapid/rapid.py:3686
 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:3424
+#: rapid/rapid.py:3698
 #, 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:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -294,87 +305,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:3707
 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:3712
 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:3718
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s tilgjengeleg"
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3452
+#: rapid/rapid.py:3726
 #, python-format
 msgid "Backing up photos and videos to %(path)s"
 msgstr "Tek tryggleikskopi av bilete og videoar til %(path)s"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3455
+#: rapid/rapid.py:3729
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Tek tryggleikskopi til %(path)s"
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3458
+#: rapid/rapid.py:3732
 #, python-format
 msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr "Tek tryggleikskopi av bilete  til %(path)s og videoar til %(path2)s"
 
-#: rapid/rapid.py:3465
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3494
+#: rapid/rapid.py:3768
 msgid "Program preferences are invalid"
 msgstr "Programinnstillingane er ugyldige"
 
-#: rapid/rapid.py:3613 rapid/rpdfile.py:235
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
 msgid "Photo"
 msgstr "Bilete"
 
-#: rapid/rapid.py:3615 rapid/rpdfile.py:255
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:3624
+#: rapid/rapid.py:3921
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "Nedlastingsmappa til %(file_type)s finst ikkje"
 
-#: rapid/rapid.py:3626 rapid/rapid.py:3640 rapid/rapid.py:3653
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
 msgid "Folder: %s"
 msgstr "Mappe: %s"
 
-#: rapid/rapid.py:3638
+#: rapid/rapid.py:3935
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "Nedlastingsmappa til %(file_type)s er ugyldig"
 
-#: rapid/rapid.py:3651
+#: rapid/rapid.py:3948
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "Nedlastingsmappa til %(file_type)s er ikkje skrivbar"
 
-#: rapid/rapid.py:3729
+#: rapid/rapid.py:4034
 msgid "Thumbnails"
 msgstr "Miniatyrbilete"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3777
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -383,43 +394,68 @@ msgstr ""
 "vis programinformasjon på kommandolinja når programmet køyrer \n"
 "(standard: %default)"
 
-#: rapid/rapid.py:3778
+#: rapid/rapid.py:4090
 msgid "display debugging information when run from the command line"
 msgstr "vis avlusingsinformasjon ved køyring frå kommandolinja"
 
-#: rapid/rapid.py:3779
+#: rapid/rapid.py:4091
 msgid "only output errors to the command line"
 msgstr "vis berre feil på kommandolinja"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3781
+#: rapid/rapid.py:4093
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 "vis kva for bilet- og videofiltypane programmet gjenkjenner, og avslutt"
 
-#: rapid/rapid.py:3783
+#: rapid/rapid.py:4095
+msgid ""
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
+msgstr ""
+"oppdag automatisk einingar du vil lasta ned frå, overstyrer eksisterande "
+"innstillingar"
+
+#: rapid/rapid.py:4096
+msgid ""
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
+msgstr ""
+"manuelt spesifiser stien til eininga du vil lasta ned frå, overstyrer "
+"eksisterande innstillingar"
+
+#: rapid/rapid.py:4097
 msgid "reset all program settings and preferences and exit"
 msgstr "nullstill alle programinnstillingar og avslutt"
 
-#: rapid/rapid.py:3801
+#: rapid/rapid.py:4110
+msgid ""
+"Error: specify device auto-detection or manually specify a device's path "
+"from which to download, but do not do both."
+msgstr ""
+"Feil: Bruk auto-oppdaging av einingar eller oppgi ei sti til ei eining du "
+"vil lasta ned frå, men ikkje gjer begge på ein gong."
+
+#: rapid/rapid.py:4133
 #, python-format
 msgid "and %s"
 msgstr "og %s"
 
-#: rapid/rapid.py:3809
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
 msgstr "Alle innstillingar er nullstilte"
 
-#: rapid/backupfile.py:142 rapid/backupfile.py:165
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
 msgid "Backing up error"
 msgstr "Feil ved tryggleikskopiering"
 
-#: rapid/backupfile.py:144
+#: rapid/backupfile.py:151
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Klarte ikkje å opprette målmappa %(directory)s\n"
 
-#: rapid/backupfile.py:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -428,13 +464,29 @@ msgstr ""
 "Kjelde: %(source)s\n"
 "Mål: %(destination)s"
 
-#: rapid/backupfile.py:149 rapid/backupfile.py:169
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Feil: %(inst)s"
 
-#: rapid/copyfiles.py:159 rapid/subfolderfile.py:211
-#: rapid/subfolderfile.py:352 rapid/subfolderfile.py:370
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -443,492 +495,506 @@ msgstr ""
 "%(problem)s\n"
 "Fil: %(file)s"
 
-#: rapid/device.py:79
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr ""
+
+#: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Oppdaga eining"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/device.py:88
+#: rapid/device.py:89
 msgid ""
 "Should this device or partition be used to download photos or videos from?"
 msgstr "Vil du laste ned bilete eller videoar frå denne eininga/partisjonen?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/device.py:107
+#: rapid/device.py:108
 msgid "_Remember this choice"
 msgstr "_Hugs dette valet"
 
-#: 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 "Filnamn"
 
-#: rapid/generatenameconfig.py:153
+#: rapid/generatenameconfig.py:154
 msgid "Metadata"
 msgstr "Metadata"
 
-#: rapid/generatenameconfig.py:154
+#: rapid/generatenameconfig.py:155
 msgid "Sequences"
 msgstr "Sekvensar"
 
 #. 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 "Jobbnamn"
 
-#: rapid/generatenameconfig.py:157
+#: rapid/generatenameconfig.py:158
 msgid "Image date"
 msgstr "Biletdato"
 
-#: rapid/generatenameconfig.py:158
+#: rapid/generatenameconfig.py:159
 msgid "Video date"
 msgstr "Videodato"
 
-#: rapid/generatenameconfig.py:159
+#: rapid/generatenameconfig.py:160
 msgid "Today"
 msgstr "Idag"
 
-#: rapid/generatenameconfig.py:160
+#: rapid/generatenameconfig.py:161
 msgid "Yesterday"
 msgstr "Igår"
 
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/generatenameconfig.py:162
+#: rapid/generatenameconfig.py:163
 msgid "Download time"
 msgstr "Nedlastingstidspunkt"
 
 #. 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 "Namn + 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 "Namn"
 
 #. 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 "Bilettal"
 
-#: rapid/generatenameconfig.py:171
+#: rapid/generatenameconfig.py:172
 msgid "Video number"
 msgstr "Videotal"
 
 #. 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 "Blenderopning"
 
 #. 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 "Lukketid"
 
 #. 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 "Kameramerke"
 
 #. 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 "Kort kameramodell"
 
 #. 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 "Bindestrek, kort kameramodell"
 
 #. 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 "Serienummer"
 
 #. 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 "Eksponeringsteljar"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: rapid/generatenameconfig.py:193
+#: rapid/generatenameconfig.py:194
 msgid "File number"
 msgstr "Filnummer"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: rapid/generatenameconfig.py:195
+#: rapid/generatenameconfig.py:196
 msgid "Folder only"
 msgstr "Berre mappa"
 
 #. 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 "Namn på eigar"
 
-#: rapid/generatenameconfig.py:200
+#: rapid/generatenameconfig.py:201
 msgid "Codec"
 msgstr "Kodek"
 
-#: rapid/generatenameconfig.py:201
+#: rapid/generatenameconfig.py:202
 msgid "Width"
 msgstr "Breidd"
 
-#: rapid/generatenameconfig.py:202
+#: rapid/generatenameconfig.py:203
 msgid "Height"
 msgstr "Høgd"
 
-#: rapid/generatenameconfig.py:203
+#: rapid/generatenameconfig.py:204
 msgid "Length"
 msgstr "Lengd"
 
-#: rapid/generatenameconfig.py:204
+#: rapid/generatenameconfig.py:205
 msgid "Frames Per Second"
 msgstr "Bilet per sekund"
 
-#: rapid/generatenameconfig.py:205
+#: rapid/generatenameconfig.py:206
 msgid "Artist"
 msgstr "Kunstnar"
 
-#: rapid/generatenameconfig.py:206
+#: rapid/generatenameconfig.py:207
 msgid "Copyright"
 msgstr "Opphavsrett"
 
 #. 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 "Nedlastingar idag"
 
 #. 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 "Øktteljar"
 
 #. 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 "Undermappeteljar"
 
 #. 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 "Lagra tal"
 
 #. 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 tal"
 
 #. 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 tal"
 
 #. 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 to tal"
 
 #. 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 tre tal"
 
 #. 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 fire tal"
 
 #. 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 "Opphavleg Versalisering"
 
 #. 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 BOKSTAVAR"
 
 #. 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å bokstavar"
 
-#: rapid/generatenameconfig.py:233
+#: rapid/generatenameconfig.py:234
 msgid "One digit"
 msgstr "Eitt tal"
 
-#: rapid/generatenameconfig.py:234
+#: rapid/generatenameconfig.py:235
 msgid "Two digits"
 msgstr "To tal"
 
-#: rapid/generatenameconfig.py:235
+#: rapid/generatenameconfig.py:236
 msgid "Three digits"
 msgstr "Tre tal"
 
-#: rapid/generatenameconfig.py:236
+#: rapid/generatenameconfig.py:237
 msgid "Four digits"
 msgstr "Fire tal"
 
-#: rapid/generatenameconfig.py:237
+#: rapid/generatenameconfig.py:238
 msgid "Five digits"
 msgstr "Fem tal"
 
-#: rapid/generatenameconfig.py:238
+#: rapid/generatenameconfig.py:239
 msgid "Six digits"
 msgstr "Seks tal"
 
-#: rapid/generatenameconfig.py:239
+#: rapid/generatenameconfig.py:240
 msgid "Seven digits"
 msgstr "Sju tal"
 
 #. 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 "ÅÅÅÅ"
 
 #. 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 "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ånad (heile)"
+
+#. 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ånad (forkorta)"
+
+#. 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 "TT"
 
 #. 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 (minutt)"
 
 #. 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 "Innstillingane for undermapper burde ikkje byrje med %s"
 
-#: rapid/preferencesdialog.py:373
+#: rapid/preferencesdialog.py:376
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Innstillingane for undermapper burde ikkje ende 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 "Innstillingane for undermapper burde ikkje ha to %s etter kvarandre"
 
-#: rapid/preferencesdialog.py:436 rapid/preferencesdialog.py:697
+#: rapid/preferencesdialog.py:439 rapid/preferencesdialog.py:700
 msgid "Remove all Job Codes?"
 msgstr "Fjern alle jobbnamn?"
 
-#: 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 jobbnamn fjernast?"
 
-#: rapid/preferencesdialog.py:443
+#: rapid/preferencesdialog.py:446
 msgid "Remove all Remembered Paths?"
 msgstr "Fjern alle hugsa søkjestiar?"
 
-#: rapid/preferencesdialog.py:444
+#: rapid/preferencesdialog.py:447
 msgid "Should all remembered paths be removed?"
 msgstr "Skal alle hugsa søkjestiar fjernast?"
 
-#: rapid/preferencesdialog.py:450
+#: rapid/preferencesdialog.py:453
 msgid "Remove all Ignored Paths?"
 msgstr "Fjern alle oversedde søkjestiar?"
 
-#: rapid/preferencesdialog.py:451
+#: rapid/preferencesdialog.py:454
 msgid "Should all ignored paths be removed?"
 msgstr "Skal alle oversedde søkjestiar fjernast?"
 
-#: rapid/preferencesdialog.py:462
+#: rapid/preferencesdialog.py:465
 msgid "Error in Photo Rename preferences"
 msgstr "Feil i innstillingane til biletomdøping"
 
-#: rapid/preferencesdialog.py:642
+#: rapid/preferencesdialog.py:645
 msgid "Error in Video Rename preferences"
 msgstr "Feil i innstillingane til videoomdøping"
 
-#: rapid/preferencesdialog.py:663
+#: rapid/preferencesdialog.py:666
 msgid "Error in Photo Download Subfolders preferences"
 msgstr "Feil i innstillingane til undermapper for biletnedlasting"
 
-#: rapid/preferencesdialog.py:680
+#: rapid/preferencesdialog.py:683
 msgid "Error in Video Download Subfolders preferences"
 msgstr "Feil i innstillingane til undermapper for videonedlasting"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:739
+#: rapid/preferencesdialog.py:742
 msgid "Enter a Job Code"
 msgstr "Skriv inn eit jobbnamn"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:755
+#: rapid/preferencesdialog.py:758
 msgid "Enter a new Job Code, or select a previous one"
 msgstr "Skriv inn eit jobbnamn, eller vel eit du har nytta tidlegare"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:758
+#: rapid/preferencesdialog.py:761
 msgid "Enter a new Job Code"
 msgstr "Skriv inn eit nytt jobbnamn"
 
-#: rapid/preferencesdialog.py:763
+#: rapid/preferencesdialog.py:766
 msgid "Job Code:"
 msgstr "Jobbnamn:"
 
-#: rapid/preferencesdialog.py:819
+#: rapid/preferencesdialog.py:822
 msgid "Enter a Path to Ignore"
 msgstr "Oppgi ein søkjesti å oversjå"
 
-#: rapid/preferencesdialog.py:831
+#: rapid/preferencesdialog.py:834
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 "Oppgi ein sti som du vil aldri skal gjennomsøkjast etter bilete eller videoar"
 
-#: rapid/preferencesdialog.py:836
+#: rapid/preferencesdialog.py:839
 msgid "Path:"
 msgstr "Sti:"
 
-#: rapid/preferencesdialog.py:1079
+#: rapid/preferencesdialog.py:1092
 msgid "Job Code"
 msgstr "Jobbnamn"
 
-#: rapid/preferencesdialog.py:1350
+#: rapid/preferencesdialog.py:1363
 msgid "Select a folder in which to backup photos"
 msgstr "Vel ei mappe kor du vil tryggleikskopiera bilete"
 
-#: rapid/preferencesdialog.py:1363
+#: rapid/preferencesdialog.py:1376
 msgid "Select a folder in which to backup videos"
 msgstr "Vel ei mappe kor du vil tryggleikskopiera videoar"
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/preferencesdialog.py:1458
+#: rapid/preferencesdialog.py:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -936,7 +1002,7 @@ msgstr ""
 "<i><b>Åtvaring:</b> Det er ikkje nok metadata for å fullt ut\n"
 "generere namnet. Ver vennleg og nytt andre omdøpingsval.</i>"
 
-#: rapid/preferencesdialog.py:1509
+#: rapid/preferencesdialog.py:1524
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -945,13 +1011,13 @@ msgstr ""
 "generere undermappene. Ver vennleg og nytt andre omdøpingsval.</i><"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/preferencesdialog.py:1512
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Døme: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1602
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -962,7 +1028,7 @@ msgstr ""
 "og kan ikkje nyttast.\n"
 "Dei blir endra til standardverdiar."
 
-#: rapid/preferencesdialog.py:1747
+#: rapid/preferencesdialog.py:1762
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -973,7 +1039,7 @@ msgstr ""
 "endrar dei:\n"
 "%s"
 
-#: rapid/preferencesdialog.py:1749
+#: rapid/preferencesdialog.py:1764
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -984,142 +1050,147 @@ msgstr ""
 "endrar det:\n"
 "%s"
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1765
 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:1949
 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:1951
 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:363
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
 msgstr "undermappe"
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:361
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr "filnamn"
 
-#: rapid/problemnotification.py:80
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr "Dato-/tidsverdien %s synest ugyldig."
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:86
 msgid "Filename does not have an extension."
 msgstr "Filnamnet manglar filending."
 
 #. a number component is something like the 8346 in IMG_8346.JPG
-#: rapid/problemnotification.py:83
+#: rapid/problemnotification.py:88
 msgid "Filename does not have a number component."
 msgstr "Filnamnet manglar nummerdelen."
 
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr "Feil ved oppretting av %s-komponenten."
 
 #. a generic problem
-#: rapid/problemnotification.py:86
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr "Klarte ikkje å lesa metadata i %(filetype)s."
 
-#: rapid/problemnotification.py:88
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "Klarte ikkje å oppretta %(filetype)s %(area)s."
 
-#: rapid/problemnotification.py:90 rapid/problemnotification.py:91
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr "Ein feil oppstod ved kopiering av %(filetype)s"
 
-#: rapid/problemnotification.py:93 rapid/problemnotification.py:94
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr ""
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "%(filetype)s finst allereie"
 
-#: rapid/problemnotification.py:97
+#: rapid/problemnotification.py:105
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1128,7 +1199,7 @@ msgstr ""
 "Kunne ikkje ta tryggleikskopi av %(filetype)s, fann inga målmappe for "
 "tryggleikskopiar."
 
-#: rapid/problemnotification.py:102
+#: rapid/problemnotification.py:110
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -1137,12 +1208,12 @@ msgstr ""
 "%(image1)s vart teke den %(image1_date)s kl. %(image1_time)s, og %(image2)s "
 "den %(image2_date)s kl. %(image2_time)s."
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "%(filetype)s er allereie lasta ned"
 
-#: rapid/problemnotification.py:107
+#: rapid/problemnotification.py:115
 #, python-format
 msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
@@ -1151,538 +1222,562 @@ msgstr ""
 "Den eksisterande %(filetype)s-en vart sist endra sist den %(date)s kl. "
 "%(time)s, og har fått «%(identifier)s» som unik ID."
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:116
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 "Den eksisterande %(filetype)s-en var sist endra den %(date)s kl. %(time)s."
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:117
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr "Manglar data for å namngi %(filetype)s."
 
-#: rapid/problemnotification.py:111
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Feil: %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:201
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr "Metadataen kan vera korrupt."
 
-#: rapid/problemnotification.py:204
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
 msgstr "Filnamnet, filendinga og Exif-informasjonen er allereie overført."
 
-#: rapid/problemnotification.py:223
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " Han vart tryggleikskopiert til %(volume)s"
 
-#: rapid/problemnotification.py:225
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr " Han vart tryggleikskopiert til dei følgjande einingane: "
 
-#: rapid/problemnotification.py:227 rapid/problemnotification.py:288
-#: rapid/problemnotification.py:300
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s og %(final_volume)s."
 
-#: rapid/problemnotification.py:240
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
 "%(details)s"
 msgstr "Fann bilete med same filnamn, men tekne ved ulike tider: %(details)s"
 
-#: rapid/problemnotification.py:257
+#: rapid/problemnotification.py:269
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr "Ein feil oppstod ved tryggleikskopiering til %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:259
+#: rapid/problemnotification.py:271
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr "Ein feil oppstod ved tryggleikskopiering til %(volume)s."
 
-#: rapid/problemnotification.py:261
+#: rapid/problemnotification.py:273
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr "Ein feil oppstod ved tryggleikskopiering til følgjande einingar: "
 
-#: rapid/problemnotification.py:265 rapid/problemnotification.py:313
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:267
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:271 rapid/problemnotification.py:315
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, 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:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s og %(volume)s."
 
-#: rapid/problemnotification.py:284
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "Tryggleikskopien finst allereie på %(volume)s."
 
-#: rapid/problemnotification.py:286
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr "Tryggleikskopien finst allereie på følgjande stader: "
 
-#: rapid/problemnotification.py:296
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "Tryggleikskopien vart overskriven på %(volume)s."
 
-#: rapid/problemnotification.py:298
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr "Tryggleikskopien vart overskriven på følgjande einingar: "
 
-#: rapid/problemnotification.py:309
+#: rapid/problemnotification.py:321
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr "Ein feil oppstod ved oppretting av mapper på %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:311
+#: rapid/problemnotification.py:323
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 "Feil oppstod ved oppretting av mapper på følgjande einingar for "
 "tryggleikskopiering: "
 
-#: rapid/problemnotification.py:322
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "%(previousproblem)s I tillegg, %(newproblem)s"
 
-#: rapid/problemnotification.py:330
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " I tillegg oppstod %(problems)s."
 
-#: rapid/problemnotification.py:332
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " I tillegg oppstod %(problem)s."
 
-#: rapid/problemnotification.py:341
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "%(type)s-metadataen manglar."
 
-#: rapid/problemnotification.py:343
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr "Følgjande metadata manglar: "
 
-#: rapid/problemnotification.py:346
+#: rapid/problemnotification.py:371
 #, 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:388
 msgid "Problems in subfolder and filename generation"
 msgstr "Problem ved oppretting av undermappe og filnamn"
 
-#: rapid/problemnotification.py:365
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr "Problem ved oppretting av undermappe og filnamn"
 
-#: rapid/problemnotification.py:368
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Problem ved oppretting av %s"
 
-#: rapid/problemnotification.py:370
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Problem ved oppretting av %s"
 
-#: rapid/problemnotification.py:379
+#: rapid/problemnotification.py:404
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr "%(filetype)s finst allereie, men blei tryggleikskopiert"
 
-#: rapid/problemnotification.py:381
+#: rapid/problemnotification.py:406
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 "Ein feil oppstod ved kopiering av %(filetype)s-en, men han blei "
 "tryggleikskopiert"
 
-#: rapid/problemnotification.py:401
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr "Fleire feil oppstod"
 
-#: rapid/problemnotification.py:403 rapid/subfolderfile.py:230
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr "Fann bilete med like filnamn, tatt på ulike datoar"
 
-#: rapid/problemnotification.py:409
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr "det oppstod feil i tryggleikskopieringa"
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr "Det oppstod feil i tryggleikskopieringa"
 
-#: rapid/problemnotification.py:412
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr "det oppstod ein feil i tryggleikskopieringa"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr "Det oppstod ein feil i tryggleikskopieringa"
 
 #. e.g.
-#: rapid/problemnotification.py:416
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, og %(backinguperror)s"
 
-#: rapid/rpdfile.py:139
+#: rapid/rpdfile.py:159
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/subfolderfile.py:79
+#: rapid/rpdfile.py:169
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
+msgstr "skannar (fann %(photos)s bilete og %(videos)s videoar) …"
+
+#: rapid/subfolderfile.py:81
 #, 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:325
+msgid "subfolder and filename"
+msgstr "undermappe og filnamn"
+
+#: rapid/subfolderfile.py:406
 msgid "Photo has already been downloaded"
 msgstr "Biletet er allereie lasta ned"
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:407
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Kjelde: %(source)s"
 
-#: rapid/subfolderfile.py:359
-msgid "subfolder and filename"
-msgstr "undermappe og filnamn"
-
-#: rapid/subfolderfile.py:397
+#: rapid/subfolderfile.py:485
 msgid "Failed to create download subfolder"
 msgstr "Klarte ikkje å lasta ned undermappa"
 
-#: rapid/subfolderfile.py:398
+#: rapid/subfolderfile.py:486
 #, python-format
 msgid "Path: %s"
 msgstr "Sti: %s"
 
 #: rapid/glade3/rapid.ui.h:1
 msgid "About..."
-msgstr "Om …"
+msgstr "Om …"
 
 #: rapid/glade3/rapid.ui.h:2
-msgid "Check All"
-msgstr "Merk alle"
+msgid "_Check All"
+msgstr "_Merk alle"
 
 #: rapid/glade3/rapid.ui.h:3
 msgid "Check All Photos"
-msgstr "Merk alle bilete"
+msgstr "Sjekk alle bilete"
 
 #: rapid/glade3/rapid.ui.h:4
 msgid "Check All Videos"
-msgstr "Merk alle videoar"
+msgstr "Sjekk alle videoar"
 
-#: rapid/glade3/rapid.ui.h:6
-msgid "Download / Pause"
-msgstr "Last ned / Pause"
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "_Doner..."
 
 #: rapid/glade3/rapid.ui.h:7
-msgid "Get Help Online..."
-msgstr "Få hjelp på nettet …"
+msgid "_Get Help Online..."
+msgstr "_Få hjelp på nettet..."
 
 #: rapid/glade3/rapid.ui.h:8
 msgid "Help"
 msgstr "Hjelp"
 
 #: rapid/glade3/rapid.ui.h:9
-msgid "Make a Donation..."
-msgstr "Doner …"
+msgid "Preferences"
+msgstr "Innstillingar"
 
 #: rapid/glade3/rapid.ui.h:10
-msgid "Next File"
-msgstr "Neste fil"
+msgid "Quit"
+msgstr "Avslutt"
 
 #: rapid/glade3/rapid.ui.h:11
-msgid "Preferences"
-msgstr "Innstillingar"
+msgid "Refresh"
+msgstr "Frisk opp att"
 
 #: rapid/glade3/rapid.ui.h:12
-msgid "Previous File"
-msgstr "Førre fil"
+msgid "_Report a Problem..."
+msgstr "_Meld frå om eit problem"
 
 #: rapid/glade3/rapid.ui.h:13
-msgid "Quit"
-msgstr "Avslutt"
+msgid "Translate this Application..."
+msgstr "Omsett denne applikasjonen …"
 
-#: rapid/glade3/rapid.ui.h:15
-msgid "Refresh"
-msgstr "Oppdater"
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr "Merk _ingen"
 
 #: rapid/glade3/rapid.ui.h:16
-msgid "Report a Problem..."
-msgstr "Rapporter eit problem …"
+msgid "_File"
+msgstr "_Fil"
 
 #: rapid/glade3/rapid.ui.h:17
-msgid "Select All Wit_h Job Code"
-msgstr "Vel alle med _jobbnamn"
+msgid "Download / Pause"
+msgstr "Last ned / Pause"
 
 #: rapid/glade3/rapid.ui.h:18
-msgid "Select All Without _Job Code"
-msgstr "Vel alle _utan jobbnamn"
+msgid "_Select"
+msgstr "_Vel"
 
 #: rapid/glade3/rapid.ui.h:19
-msgid "Translate this Application..."
-msgstr "Omsett dette programmet …"
+msgid "Select All Without _Job Code"
+msgstr "Vel alle _utan jobbnamn"
 
 #: rapid/glade3/rapid.ui.h:20
-msgid "Uncheck All"
-msgstr "Merk ingen"
+msgid "Select All Wit_h Job Code"
+msgstr "Vel alle med _jobbnamn"
 
 #: rapid/glade3/rapid.ui.h:21
-msgid "_Check All"
-msgstr "_Merk alle"
+msgid "_View"
+msgstr "_Vis"
 
 #: rapid/glade3/rapid.ui.h:22
-msgid "_Clear Completed Downloads"
-msgstr "_Fjern fullførte nedlastingar"
+msgid "_Error Log"
+msgstr "_Feillogg"
 
 #: rapid/glade3/rapid.ui.h:23
-msgid "_Download"
-msgstr "_Last ned"
+msgid "_Clear Completed Downloads"
+msgstr "_Fjern fullførte nedlastingar"
 
 #: rapid/glade3/rapid.ui.h:24
-msgid "_Error Log"
-msgstr "_Feillogg"
+msgid "Previous File"
+msgstr "Førre fil"
 
 #: rapid/glade3/rapid.ui.h:25
-msgid "_File"
-msgstr "_Fil"
+msgid "Next File"
+msgstr "Neste fil"
 
 #: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
 msgstr "_Hjelp"
 
 #: rapid/glade3/rapid.ui.h:27
-msgid "_Include in download"
-msgstr "Inkluder i _nedlastinga"
-
-#: rapid/glade3/rapid.ui.h:28
-msgid "_Make a Donation..."
-msgstr "_Doner..."
-
-#: rapid/glade3/rapid.ui.h:29
-msgid "_Select"
-msgstr "_Vel"
-
-#: rapid/glade3/rapid.ui.h:30
 msgid "_Translate this Application..."
 msgstr "_Omset dette programmet..."
 
-#: rapid/glade3/rapid.ui.h:31
-msgid "_Uncheck All"
-msgstr "Merk _ingen"
+#: rapid/glade3/rapid.ui.h:28
+msgid "_Include in download"
+msgstr "Inkluder i _nedlastinga"
 
-#: rapid/glade3/rapid.ui.h:32
-msgid "_View"
-msgstr "_Vis"
+#: rapid/glade3/rapid.ui.h:29
+msgid "_Download"
+msgstr "_Last ned"
 
 #: rapid/glade3/prefs.ui.h:1
-msgid " "
-msgstr " "
+msgid "Preferences: Rapid Photo Downloader"
+msgstr "Innstillingar: Rapid Photo Downloader"
 
 #: rapid/glade3/prefs.ui.h:2
-msgid " hh:mm"
-msgstr " tt:mm"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Biletnedlastingsmapper</span>"
 
 #: rapid/glade3/prefs.ui.h:3
-msgid ":"
-msgstr ":"
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr "<i>Døme: /home/brukar/Bilete</i>"
 
 #: rapid/glade3/prefs.ui.h:4
-msgid "<b>Backup</b>"
-msgstr "<b>Tryggleikskopi</b>"
+msgid "<b>Download Subfolders</b>"
+msgstr "<b>Nedlastingsundermapper</b>"
 
 #: rapid/glade3/prefs.ui.h:5
-msgid "<b>Compatibility with Other Operating Systems</b>"
-msgstr "<b>Kompatibilitet med andre operativsystem</b>"
+msgid "Download folder:"
+msgstr "Nedlastingsmappe:"
 
 #: rapid/glade3/prefs.ui.h:6
-msgid "<b>Download Folder</b>"
-msgstr "<b>Nedlastingsmappe</b>"
+msgid ""
+"Choose the download folder. Subfolders for the downloaded photos will be "
+"automatically created in this folder using the structure specified below."
+msgstr ""
+"Vel ei nedlastingsmappe. Når du nyttar strukturen nedanfor blir det \n"
+"automatisk oppretta undermapper for dei nedlasta bileta i denne mappa."
 
 #: rapid/glade3/prefs.ui.h:7
-msgid "<b>Download Subfolders</b>"
-msgstr "<b>Nedlastingsundermapper</b>"
+msgid "<b>Download Folder</b>"
+msgstr "<b>Nedlastingsmappe</b>"
 
 #: rapid/glade3/prefs.ui.h:8
-msgid "<b>Example</b>"
-msgstr "<b>Døme</b>"
+msgid "Photo Folders"
+msgstr "Biletmapper"
 
 #: rapid/glade3/prefs.ui.h:9
-msgid "<b>Job Codes</b>"
-msgstr "<b>Jobbnamn</b>"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Omdøping av bilete</span>\t"
 
 #: rapid/glade3/prefs.ui.h:10
 msgid "<b>Photo Rename</b>"
 msgstr "<b>Omdøping av bilete</b>"
 
 #: rapid/glade3/prefs.ui.h:11
-msgid "<b>Photo and Video Name Conflicts</b>"
-msgstr "<b>Namnekonfliktar i bilete og video</b>"
+msgid " "
+msgstr " "
 
 #: rapid/glade3/prefs.ui.h:12
-msgid "<b>Program Automation</b>"
-msgstr "<b>Automatisering</b>"
+msgid "<i>New:</i>"
+msgstr "<i>Ny:</i>"
 
 #: rapid/glade3/prefs.ui.h:13
-msgid "<b>Sequence Numbers</b>"
-msgstr "<b>Sekvenstal</b>"
+msgid "<i>Original:</i>"
+msgstr "<i>Opphavleg:</i>"
 
 #: rapid/glade3/prefs.ui.h:14
-msgid "<i>/media/externaldrive/Photos</i>"
-msgstr "<i>/media/eksterndisk/Bilete</i>"
+msgid "<b>Example</b>"
+msgstr "<b>Døme</b>"
 
 #: rapid/glade3/prefs.ui.h:15
-msgid "<i>Example: /home/user/Pictures</i>"
-msgstr "<i>Døme: /home/brukar/Bilete</i>"
+msgid "Photo Rename"
+msgstr "Omdøping av bilete"
 
 #: rapid/glade3/prefs.ui.h:16
-msgid "<i>Example:</i>"
-msgstr "<i>Døme:</i>"
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Videonedlastingsmapper</span>"
 
 #: rapid/glade3/prefs.ui.h:17
-msgid "<i>New:</i>"
-msgstr "<i>Ny:</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 ""
+"Orsak, videonedlasting er skrudd av. Ver venleg og last ned anten python-"
+"pakkene <i>hachoir metadata</i> og <i>kaa metadata</i>, eller "
+"<i>exiftool</i>, for å lasta ned videoar."
 
 #: rapid/glade3/prefs.ui.h:18
-msgid "<i>Original:</i>"
-msgstr "<i>Opphavleg:</i>"
+msgid ""
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
+msgstr ""
+"Vel ei nedlastingsmappe. Når du nyttar strukturen nedanfor blir det \n"
+"automatisk oppretta undermapper for dei nedlasta videoane i denne mappa."
 
 #: rapid/glade3/prefs.ui.h:19
-msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">Tryggleikskopi</span>\t"
+msgid "Video Folders"
+msgstr "Videomapper"
 
 #: rapid/glade3/prefs.ui.h:20
-msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Einingsinnstillingar</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Omdøping av videoar</span>\t"
 
 #: rapid/glade3/prefs.ui.h:21
-msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Einingar</span>"
+msgid "Video Rename"
+msgstr "Omdøping av videoar"
 
 #: rapid/glade3/prefs.ui.h:22
-msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Feilhandtering</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Omdøpingsval</span>"
 
 #: rapid/glade3/prefs.ui.h:23
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Jobbnamn</span>"
+msgid "<b>Sequence Numbers</b>"
+msgstr "<b>Sekvenstal</b>"
 
 #: rapid/glade3/prefs.ui.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Ymse</span>"
+msgid ""
+"Specify the time in 24 hour format at which the <i>Downloads today</i> "
+"sequence number should be reset."
+msgstr ""
+"Oppgi tida i 24-timarsformat som sekvensteljaren <i>Nedlastingar idag</i> "
+"skal nullstillast til."
 
 #: rapid/glade3/prefs.ui.h:25
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Biletnedlastingsmapper</span>"
+msgid "Day start:"
+msgstr "Dag byrjar:"
 
 #: rapid/glade3/prefs.ui.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">Omdøping av bilete</span>\t"
+msgid "Downloads today:"
+msgstr "Nedlastingar idag:"
 
 #: rapid/glade3/prefs.ui.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Omdøpingsval</span>"
+msgid "Stored number:"
+msgstr "Lagra tal:"
 
 #: rapid/glade3/prefs.ui.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Videonedlastingsmapper</span>"
+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\">Omdøping av videoar</span>\t"
+msgid " hh:mm"
+msgstr " tt:mm"
 
 #: rapid/glade3/prefs.ui.h:30
-msgid "Add unique identifier"
-msgstr "Legg til unik identifikator"
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "Synkroniser sekvenstal for RAW og JPEG"
 
 #: rapid/glade3/prefs.ui.h:31
-msgid "Automatically detect Portable Storage Devices"
-msgstr "Oppdag portable lagringseiningar automatisk"
+msgid "<b>Compatibility with Other Operating Systems</b>"
+msgstr "<b>Kompatibilitet med andre operativsystem</b>"
 
 #: rapid/glade3/prefs.ui.h:32
-msgid "Automatically detect backup devices"
-msgstr "Oppdag einingar for tryggleikskopiering automatisk"
+msgid ""
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
+msgstr ""
+"Oppgi om du vil fjerne teikn som andre operativsystem ikkje forstår frå "
+"bilete, videoar eller mappenamn."
 
 #: rapid/glade3/prefs.ui.h:33
-msgid "Automatically detect devices"
-msgstr "Oppdag einingar automatisk"
+msgid "Strip incompatible characters"
+msgstr "Fjern inkompatible teikn"
 
 #: rapid/glade3/prefs.ui.h:34
-msgid "Automatically rotate JPEG images"
-msgstr "Roter JPEG-bilete automatisk"
+msgid "Rename Options"
+msgstr "Omdøpingsval"
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup"
-msgstr "Tryggleikskopi"
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Jobbnamn</span>"
 
 #: rapid/glade3/prefs.ui.h:36
-msgid "Backup photos and videos when downloading"
-msgstr "Ta tryggleikskopi av bilete og videoar ved nedlasting"
+msgid "<b>Job Codes</b>"
+msgstr "<b>Jobbnamn</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 ""
-"Vel ei nedlastingsmappe. Når du nyttar strukturen nedanfor blir det \n"
-"automatisk oppretta undermapper for dei nedlasta bileta i denne mappa."
-
-#: 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 ""
-"Vel ei nedlastingsmappe. Når du nyttar strukturen nedanfor blir det \n"
-"automatisk oppretta undermapper for dei nedlasta videoane i denne mappa."
+msgid "_Add..."
+msgstr "_Legg til..."
 
 #: rapid/glade3/prefs.ui.h:39
-msgid "Day start:"
-msgstr "Dag byrjar:"
+msgid "R_emove All"
+msgstr "_Fjern alle"
 
 #: rapid/glade3/prefs.ui.h:40
-msgid "Device Options"
-msgstr "Val for einingar"
+msgid "Job Codes"
+msgstr "Jobbnamn"
 
 #: rapid/glade3/prefs.ui.h:41
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Einingar</span>"
+
+#: rapid/glade3/prefs.ui.h:42
 msgid "Devices"
 msgstr "Einingar"
 
-#: 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"
@@ -1705,36 +1800,30 @@ msgstr ""
 "Viss det fungerer dårleg eller ikkje i det heile, prøv å setja apparatet i "
 "PTP-modus. Viss det ikkje går an, må du bruka ein kortlesar.</i>"
 
-#: rapid/glade3/prefs.ui.h:47
-msgid "Download folder:"
-msgstr "Nedlastingsmappe:"
-
 #: rapid/glade3/prefs.ui.h:48
-msgid "Downloads today:"
-msgstr "Nedlastingar idag:"
+msgid "Automatically detect Portable Storage Devices"
+msgstr "Oppdag portable lagringseiningar automatisk"
 
 #: rapid/glade3/prefs.ui.h:49
-msgid "Error Handling"
-msgstr "Feilhandtering"
+msgid "Automatically detect devices"
+msgstr "Oppdag einingar automatisk"
 
 #: rapid/glade3/prefs.ui.h:50
-msgid "Exit program even if download had warnings or errors"
-msgstr "Avslutt programmet sjølv om nedlastinga hadde feil eller åtvaringar"
-
-#: rapid/glade3/prefs.ui.h:51
-msgid "Exit program when download completes"
-msgstr "Avslutt programmet når nedlastinga er ferdig"
-
-#: rapid/glade3/prefs.ui.h:52
-msgid "Generate thumbnails (slower)"
-msgstr "Lag miniatyrbilete (treigare)"
-
-#: rapid/glade3/prefs.ui.h:53
 msgid ""
-"If you disable automatic detection, choose the exact backup locations."
+"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 ""
-"Viss du skrur av automatisk oppdaging, må du oppgi kor du vil ta "
-"tryggleikskopi til."
+"Viss du skrur på automatisk oppdaging på ei berbar lagringseining, vil heile "
+"eininga gjennomsøkjast. På store einingar kan dette ta litt tid.\n"
+"Når dette er skrudd på, og programmet oppdagar ei mogleg eining, vil det "
+"spørja deg om du vil søkja gjennom eininga eller ikkje."
+
+#: rapid/glade3/prefs.ui.h:53
+msgid "Location:"
+msgstr "Stad:"
 
 #: rapid/glade3/prefs.ui.h:54
 msgid ""
@@ -1744,190 +1833,186 @@ msgstr ""
 "Viss du skrur av automatisk oppdaging, må du oppgi kor bileta og videoane er."
 
 #: rapid/glade3/prefs.ui.h:55
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Einingsinnstillingar</span>"
+
+#: rapid/glade3/prefs.ui.h:56
+msgid "Remembered Paths"
+msgstr "Hugsa stiar"
+
+#: 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 ""
-"Viss du skrur på automatisk oppdaging på ei berbar lagringseining, vil heile "
-"eininga gjennomsøkjast. På store einingar kan dette ta litt tid.\n"
-"Når dette er skrudd på, og programmet oppdagar ei mogleg eining, vil det "
-"spørja deg om du vil søkja gjennom eininga eller ikkje."
+"Hugsa stiar er kopla til einingar som du har valt å alltid søkja gjennom, "
+"eller alltid oversjå, ved automatisk oppdaging av berbare lagringseiningar."
 
 #: rapid/glade3/prefs.ui.h:58
 msgid "Ignored Paths"
 msgstr "Oversedde stiar"
 
 #: rapid/glade3/prefs.ui.h:59
-msgid "Job Codes"
-msgstr "Jobbnamn"
-
-#: rapid/glade3/prefs.ui.h:60
-msgid "Location:"
-msgstr "Stad:"
+msgid ""
+"Specify the ending portion of any paths you want ignored when scanning "
+"devices for photos or videos. Any path ending with the values below will not "
+"be scanned."
+msgstr ""
+"Oppgi endinga av stiane som du vil oversjå når du søkjer gjennom einingar "
+"etter bilete eller videoar. Stiar som ender med verdiane under vil ikkje bli "
+"gjennomsøkt."
 
 #: rapid/glade3/prefs.ui.h:61
-msgid "Miscellaneous"
-msgstr "Ymse"
+msgid "Re_move All"
+msgstr "_Fjern alle"
 
 #: rapid/glade3/prefs.ui.h:62
-msgid "Overwrite"
-msgstr "Overskriv"
+msgid "Use _python-style regular expressions"
+msgstr "Bruk _python sine regulære uttrykk"
 
 #: rapid/glade3/prefs.ui.h:63
-msgid "Performance"
-msgstr "Yting"
+msgid "Device Options"
+msgstr "Val for einingar"
 
 #: rapid/glade3/prefs.ui.h:64
-msgid "Photo Folders"
-msgstr "Biletmapper"
+msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Tryggleikskopi</span>\t"
 
 #: rapid/glade3/prefs.ui.h:65
-msgid "Photo Rename"
-msgstr "Omdøping av bilete"
+msgid "<b>Backup</b>"
+msgstr "<b>Tryggleikskopi</b>"
 
 #: rapid/glade3/prefs.ui.h:66
-msgid "Photo backup folder name:"
-msgstr "Mappenamn for tryggleikskopiering av bilete:"
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
+msgstr ""
+"Viss du skrur av automatisk oppdaging, må du oppgi kor du vil ta "
+"tryggleikskopi til."
 
 #: rapid/glade3/prefs.ui.h:67
-msgid "Photo backup location:"
-msgstr "Ta tryggleikskopi av bilete til:"
+msgid "Automatically detect backup devices"
+msgstr "Oppdag einingar for tryggleikskopiering automatisk"
 
 #: rapid/glade3/prefs.ui.h:68
-msgid "Preferences: Rapid Photo Downloader"
-msgstr "Innstillingar: 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 ""
+"Du kan ta tryggleikskopi av bilete og videoar til fleire stader når du "
+"lastar ned, t.d. til eksterne harddisker."
 
-#: rapid/glade3/prefs.ui.h:70
-msgid "R_emove All"
-msgstr "_Fjern alle"
+#: rapid/glade3/prefs.ui.h:69
+msgid "Back up photos and videos when downloading"
+msgstr "Ta tryggleikskopi av bilete og videoar ved nedlasting"
 
-#: rapid/glade3/prefs.ui.h:72
-msgid "Re_move All"
-msgstr "_Fjern alle"
+#: 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 ""
+"Oppgi mappa på eininga kor tryggleikskopiar er lagra.  \n"
+"\n"
+"<i>Merk: dette blir au nytta for å finne ut om eininga er nytta til "
+"tryggleikskopiering. Lag ei mappe med eitt av desse namna på kvar eining som "
+"du vil ta tryggleikskopi til.</i>"
 
 #: rapid/glade3/prefs.ui.h:73
-msgid "Remembered Paths"
-msgstr "Hugsa stiar"
+msgid "Photo backup location:"
+msgstr "Ta tryggleikskopi av bilete til:"
 
 #: 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 ""
-"Hugsa stiar er kopla til einingar som du har valt å alltid søkja gjennom, "
-"eller alltid oversjå, ved automatisk oppdaging av berbare lagringseiningar."
+msgid "Photo backup folder name:"
+msgstr "Mappenamn for tryggleikskopiering av bilete:"
 
 #: rapid/glade3/prefs.ui.h:75
-msgid "Rename Options"
-msgstr "Omdøpingsval"
+msgid "<i>Example:</i>"
+msgstr "<i>Døme:</i>"
 
 #: rapid/glade3/prefs.ui.h:76
-msgid "Skip"
-msgstr "Hopp over"
+msgid "<i>/media/externaldrive/Photos</i>"
+msgstr "<i>/media/eksterndisk/Bilete</i>"
 
 #: rapid/glade3/prefs.ui.h:77
-msgid "Skip download"
-msgstr "Hopp over nedlasting"
+msgid "Video backup folder name:"
+msgstr "Mappenamn for tryggleikskopiering av 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 ""
-"Orsak, videonedlasting er skrudd av. Ver venleg og last ned anten python-"
-"pakkene <i>hachoir metadata</i> og <i>kaa metadata</i>, eller "
-"<i>exiftool</i>, for å lasta ned videoar."
+msgid "Video backup location:"
+msgstr "Ta tryggleikskopi av videoar til:"
 
 #: 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."
+msgid "Back up"
 msgstr ""
-"Oppgi endinga av stiane som du vil oversjå når du søkjer gjennom einingar "
-"etter bilete eller videoar. Stiar som ender med verdiane under vil ikkje bli "
-"gjennomsøkt."
 
 #: rapid/glade3/prefs.ui.h:80
-msgid ""
-"Specify the folder in which backups are stored on the device.  \n"
-"\n"
-"<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 ""
-"Oppgi mappa på eininga kor tryggleikskopiar er lagra.  \n"
-"\n"
-"<i>Merk: dette blir au nytta for å finne ut om eininga er nytta til "
-"tryggleikskopiering. Lag ei mappe med eitt av desse namna på kvar eining som "
-"du vil ta tryggleikskopi til.</i>"
+msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Ymse</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 ""
-"Oppgi tida i 24-timarsformat som sekvensteljaren <i>Nedlastingar idag</i> "
-"skal nullstillast til."
+#: rapid/glade3/prefs.ui.h:81
+msgid "<b>Program Automation</b>"
+msgstr "<b>Automatisering</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 ""
-"Oppgi om du vil fjerne teikn som andre operativsystem ikkje forstår frå "
-"bilete, videoar eller mappenamn."
+#: rapid/glade3/prefs.ui.h:82
+msgid "Unmount (\"eject\") device upon download completion"
+msgstr "Avmonter (kople ut) eining når nedlastinga er fullført"
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:83
 msgid "Start downloading at program startup"
 msgstr "Gå i gang med å laste ned bilete når programmet startar"
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:84
 msgid "Start downloading upon device insertion"
 msgstr "Gå i gang med å laste ned når einingar blir kopla til"
 
-#: rapid/glade3/prefs.ui.h:87
-msgid "Stored number:"
-msgstr "Lagra tal:"
+#: rapid/glade3/prefs.ui.h:85
+msgid "Exit program when download completes"
+msgstr "Avslutt programmet når nedlastinga er ferdig"
 
-#: rapid/glade3/prefs.ui.h:88
-msgid "Strip incompatible characters"
-msgstr "Fjern inkompatible teikn"
+#: rapid/glade3/prefs.ui.h:86
+msgid "Exit program even if download had warnings or errors"
+msgstr "Avslutt programmet sjølv om nedlastinga hadde feil eller åtvaringar"
+
+#: rapid/glade3/prefs.ui.h:87
+msgid "Automatically rotate JPEG images"
+msgstr "Roter JPEG-bilete automatisk"
 
 #: rapid/glade3/prefs.ui.h:89
-msgid "Synchronize RAW + JPEG sequence numbers"
-msgstr "Synkroniser sekvenstal for RAW og JPEG"
+msgid "Verify files as they are downloaded"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:90
-msgid "Unmount (\"eject\") device upon download completion"
-msgstr "Avmonter (kople ut) eining når nedlastinga er fullført"
+msgid "Performance"
+msgstr "Yting"
 
 #: rapid/glade3/prefs.ui.h:91
-msgid "Use _python-style regular expressions"
-msgstr "Bruk _python sine regulære uttrykk"
+msgid "Generate thumbnails (slower)"
+msgstr "Lag miniatyrbilete (treigare)"
 
 #: rapid/glade3/prefs.ui.h:92
-msgid "Video Folders"
-msgstr "Videomapper"
+msgid "Miscellaneous"
+msgstr "Ymse"
 
 #: rapid/glade3/prefs.ui.h:93
-msgid "Video Rename"
-msgstr "Omdøping av videoar"
+msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Feilhandtering</span>"
 
 #: rapid/glade3/prefs.ui.h:94
-msgid "Video backup folder name:"
-msgstr "Mappenamn for tryggleikskopiering av video:"
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr "<b>Namnekonfliktar i bilete og video</b>"
 
 #: rapid/glade3/prefs.ui.h:95
-msgid "Video backup location:"
-msgstr "Ta tryggleikskopi av videoar til:"
+msgid "Add unique identifier"
+msgstr "Legg til unik identifikator"
 
 #: rapid/glade3/prefs.ui.h:96
+msgid "Skip download"
+msgstr "Hopp over nedlasting"
+
+#: rapid/glade3/prefs.ui.h:97
 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."
@@ -1935,7 +2020,7 @@ msgstr ""
 "Vel om du skal hoppe over fila eller leggje til ein unik identifikator når "
 "eit bilete eller ein video med det same namnet allereie er lasta ned."
 
-#: rapid/glade3/prefs.ui.h:97
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1943,17 +2028,17 @@ msgstr ""
 "Ved tryggleikskopiering, vel om du skal overskrive filer på eininga som har "
 "same namn, eller hoppe over den fila."
 
-#: 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 ""
-"Du kan ta tryggleikskopi av bilete og videoar til fleire stader når du "
-"lastar ned, t.d. til eksterne harddisker."
-
 #: rapid/glade3/prefs.ui.h:99
-msgid "_Add..."
-msgstr "_Legg til..."
+msgid "Overwrite"
+msgstr "Overskriv"
+
+#: rapid/glade3/prefs.ui.h:100
+msgid "Skip"
+msgstr "Hopp over"
+
+#: rapid/glade3/prefs.ui.h:101
+msgid "Error Handling"
+msgstr "Feilhandtering"
 
 #: rapid/glade3/about.ui.h:1
 msgid "Import your photos and videos efficiently and reliably"
@@ -2157,6 +2242,9 @@ msgstr "Importer bileta og videoane dine trygt og effektivt"
 #~ msgid "Automation"
 #~ msgstr "Automatisering"
 
+#~ msgid "Backup"
+#~ msgstr "Tryggleikskopi"
+
 #~ msgid "Backup location:"
 #~ msgstr "Kopier til:"
 
@@ -2206,8 +2294,25 @@ msgstr "Importer bileta og videoane dine trygt og effektivt"
 #~ "Rapid Photo Downloader; if not, write to the Free Software Foundation, Inc., "
 #~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#~ msgid "_Get Help Online..."
-#~ msgstr "_Få hjelp på nettet..."
+#~ msgid "Select an image folder"
+#~ msgstr "Vel ei biletmappe"
+
+#~ msgid "Select a folder in which to backup images"
+#~ msgstr "Vel ei tryggingskopimappe"
+
+#, python-format
+#~ msgid "%s images downloaded"
+#~ msgstr "%s bilete lasta ned"
+
+#, python-format
+#~ msgid "%s images skipped"
+#~ msgstr "%s bilete hoppa over"
+
+#~ msgid "Backup image already exists"
+#~ msgstr "Tryggingskopibiletet finst alt."
+
+#~ msgid "The image was not copied."
+#~ msgstr "Biletet vart ikkje kopiert."
 
-#~ msgid "_Report a Problem..."
-#~ msgstr "_Meld frå om eit problem"
+#~ msgid "Backup device missing"
+#~ msgstr "Tryggingskopieininga finst ikkje"
diff --git a/po/oc.po b/po/oc.po
index c31b19f..e4a6cb0 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,1912 +7,2061 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-13 19:03+0500\n"
-"PO-Revision-Date: 2010-08-06 20:35+0000\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:17+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 14:32+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:124 rapid/rapid.py:6299 rapid/glade3/rapid.glade.h:71
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:456
-msgid "New York"
-msgstr "Nòva York"
-
-#: rapid/rapid.py:457
-msgid "Manila"
-msgstr "Manilha"
-
-#: rapid/rapid.py:457
-msgid "Prague"
-msgstr "Praga"
-
-#: rapid/rapid.py:457
-msgid "Helsinki"
-msgstr "Helsinki"
-
-#: rapid/rapid.py:457
-msgid "Wellington"
-msgstr "Wellington"
-
-#: rapid/rapid.py:458
-msgid "Tehran"
-msgstr "Teheran"
-
-#: rapid/rapid.py:458
-msgid "Kampala"
-msgstr "Kampala"
-
-#: rapid/rapid.py:458
-msgid "Paris"
-msgstr "París"
-
-#: rapid/rapid.py:458
-msgid "Berlin"
-msgstr "Berlin"
-
-#: rapid/rapid.py:458
-msgid "Sydney"
-msgstr "Sydney"
-
-#: rapid/rapid.py:459
-msgid "Budapest"
-msgstr "Budapèst"
-
-#: rapid/rapid.py:459
-msgid "Rome"
-msgstr "Roma"
-
-#: rapid/rapid.py:459
-msgid "Moscow"
-msgstr "Moscòu"
-
-#: rapid/rapid.py:459
-msgid "Delhi"
-msgstr "Delhi"
-
-#: rapid/rapid.py:459
-msgid "Warsaw"
-msgstr "Varsòvia"
-
-#: rapid/rapid.py:460
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: rapid/rapid.py:460
-msgid "Madrid"
-msgstr "Madrid"
-
-#: rapid/rapid.py:460
-msgid "Stockholm"
-msgstr "Estocòlme"
-
-#: rapid/rapid.py:493
-msgid "Invalid Downloads Today value.\n"
-msgstr ""
-
-#: rapid/rapid.py:494
-msgid "Resetting value to zero.\n"
-msgstr ""
-
-#: rapid/rapid.py:533
-msgid "'Start of day' preference value is corrupted.\n"
-msgstr ""
-
-#: rapid/rapid.py:534
-msgid "Resetting to midnight.\n"
-msgstr ""
-
-#: rapid/rapid.py:560
-msgid "Error in Photo Rename preferences"
-msgstr ""
-
-#: rapid/rapid.py:591 rapid/rapid.py:1710
-msgid "Sorry,these preferences contain an error:\n"
-msgstr ""
-
-#: rapid/rapid.py:602
-msgid "Resetting to default values."
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:677 rapid/renamesubfolderprefs.py:198
-msgid "Job code"
-msgstr "Etiqueta de transferiment"
-
-#: rapid/rapid.py:745
-msgid "Error in Video Rename preferences"
-msgstr ""
-
-#: rapid/rapid.py:763
-msgid "Error in Photo Download Subfolders preferences"
-msgstr ""
-
-#: rapid/rapid.py:780
-msgid "Error in Video Download Subfolders preferences"
-msgstr ""
-
-#: rapid/rapid.py:813 rapid/rapid.py:1544
-msgid "photos and videos"
-msgstr ""
-
-#: rapid/rapid.py:815 rapid/rapid.py:1554 rapid/rapid.py:1679
-msgid "photos"
-msgstr ""
-
-#: rapid/rapid.py:948
-msgid "Select a folder to download photos to"
-msgstr ""
-
-#: rapid/rapid.py:966
-msgid "Select a folder to download videos to"
-msgstr ""
-
-#: rapid/rapid.py:1048
-#, python-format
-msgid "Select a folder containing %(file_types)s"
-msgstr ""
-
-#: rapid/rapid.py:1070
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
-msgstr ""
-
-#. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:1151
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
-"name. Please use other renaming options.</i>"
-msgstr ""
-
-#: rapid/rapid.py:1187
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate "
-"subfolders. Please use other subfolder naming options.</i>"
-msgstr ""
-
-#. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:1191
-#, python-format
-msgid "<i>Example: %s</i>"
-msgstr "<i>Exemple : %s</i>"
-
-#: rapid/rapid.py:1217
-msgid ""
-"Downloads today value not updated, as a download is currently occurring"
-msgstr ""
-
-#: rapid/rapid.py:1233
-msgid "Stored number value not updated, as a download is currently occurring"
-msgstr ""
-
-#: rapid/rapid.py:1263
-#, python-format
-msgid ""
-"The %(filetype)s subfolder preferences had some unnecessary values removed."
-msgstr ""
-
-#. Preferences list is now empty
-#: rapid/rapid.py:1268
-#, python-format
-msgid ""
-"The %(filetype)s subfolder preferences entered are invalid and cannot be "
-"used.\n"
-"They will be reset to their default values."
-msgstr ""
-
-#. check subfolder preferences for bad values
-#: rapid/rapid.py:1282 rapid/rapid.py:1556
-msgid "photo"
-msgstr ""
-
-#: rapid/rapid.py:1283 rapid/rapid.py:1551
-msgid "video"
-msgstr ""
-
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1520
-msgid "externaldrive1"
-msgstr "discextèrne1"
-
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1522
-msgid "externaldrive2"
-msgstr "discextèrne2"
-
-#: rapid/rapid.py:1546 rapid/rapid.py:1677
-msgid "photos or videos"
-msgstr ""
-
-#: rapid/rapid.py:1549
-msgid "videos"
-msgstr ""
-
-#: rapid/rapid.py:1561
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
 "%(time)s"
 msgstr ""
 
-#: rapid/rapid.py:1563
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr ""
 
-#: rapid/rapid.py:1566
-#, python-format
-msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
-msgstr ""
-
-#: rapid/rapid.py:1573
+#: rapid/rapid.py:127
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr ""
 
-#: rapid/rapid.py:1601 rapid/rapid.py:2267
-msgid "subfolder and filename"
-msgstr ""
+#. Device refers to a thing like a camera, memory card in its reader,
+#. external hard drive, Portable Storage Device, etc.
+#: rapid/rapid.py:162
+msgid "Device"
+msgstr "Periferic"
 
-#: rapid/rapid.py:1603 rapid/rapid.py:2269
-msgid "filename"
-msgstr ""
+#. Size refers to the total size of images on the device, typically in
+#. MB or GB
+#: rapid/rapid.py:180
+msgid "Size"
+msgstr "Talha"
 
-#: rapid/rapid.py:1605 rapid/rapid.py:2271
-msgid "subfolder"
+#: rapid/rapid.py:183
+msgid "Download Progress"
+msgstr "Progression del telecargament"
+
+#: rapid/rapid.py:343
+#, python-format
+msgid "%(device)s did not unmount"
 msgstr ""
 
 #. This refers to when a device like a hard drive is having its contents scanned,
 #. looking for photos or videos. It is visible initially in the progress bar for each device
 #. (which normally holds "x photos and videos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1693
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr "Deteccion en cors..."
 
-#: rapid/rapid.py:1804
-msgid "The following download path could not be created:\n"
+#. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
+#: rapid/rapid.py:1818
+msgid "the root of the file system"
 msgstr ""
 
-#: rapid/rapid.py:1805
+#. message in dialog box which asks the user if they really want to be downloading from this location
+#: rapid/rapid.py:1822
 #, python-format
-msgid "%(path)s: "
-msgstr ""
-
-#: rapid/rapid.py:1806 rapid/rapid.py:1807 rapid/rapid.py:1822
-#: rapid/rapid.py:1823 rapid/rapid.py:2084 rapid/rapid.py:2087
-msgid "Download cannot proceed"
-msgstr "Impossible de procedir al transferiment"
-
-#: rapid/rapid.py:1820 rapid/rapid.py:4959
-msgid "There is an error in the program preferences."
+msgid "Downloading from %(location)s."
 msgstr ""
 
-#: rapid/rapid.py:1821
+#: rapid/rapid.py:1823
 msgid ""
-"\n"
-"Please check preferences, restart the program, and try again."
+"Do you really want to download from here? On some systems, scanning this "
+"location can take a very long time."
 msgstr ""
 
-#. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-#. It refers to the actual number of photos that can be copied. For example, the user might see the following:
-#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
-#. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:1995
-#, python-format
-msgid "%(number)s %(filetypes)s"
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
+msgid "Download"
 msgstr ""
 
-#. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
-#. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-#. to the user when they run the program, signifying the number of photos found, and the device they were found on.
-#. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
-#. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
-#. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:2006
-#, python-format
-msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
+#: rapid/rapid.py:2270
+msgid "Pause"
 msgstr ""
 
-#: rapid/rapid.py:2013
-#, python-format
-msgid "Device scan complete: no %(filetypes)s found on %(device)s"
-msgstr ""
-
-#. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:2034
-msgid "The device can now be safely removed"
-msgstr ""
-
-#: rapid/rapid.py:2040
-#, python-format
-msgid "%(noFiles)s %(filetypes)s downloaded"
-msgstr ""
-
-#: rapid/rapid.py:2043
-#, python-format
-msgid "%(noFiles)s %(filetypes)s failed to download"
-msgstr ""
-
-#: rapid/rapid.py:2046 rapid/rapid.py:5744
-msgid "warnings"
-msgstr "avertiments"
-
-#: rapid/rapid.py:2048 rapid/rapid.py:5748
-msgid "errors"
-msgstr "errors"
-
-#: rapid/rapid.py:2078
-#, python-format
-msgid "Source: %s\n"
-msgstr "Font : %s\n"
-
-#: rapid/rapid.py:2080
-#, python-format
-msgid "Device: %s\n"
-msgstr ""
-
-#: rapid/rapid.py:2081
-#, python-format
-msgid "Destination: %s"
-msgstr "Destinacion %s"
-
-#: rapid/rapid.py:2082 rapid/rapid.py:2085
-msgid "Could not create temporary download directory"
-msgstr ""
-
-#: rapid/rapid.py:2085
-msgid "Error:"
-msgstr "Error :"
-
-#: rapid/rapid.py:2109
-msgid "Backup path does not exist"
-msgstr ""
-
-#: rapid/rapid.py:2110
-#, python-format
-msgid "The path %s could not be created"
-msgstr ""
-
-#: rapid/rapid.py:2111
-msgid "No backups can occur"
-msgstr ""
-
-#: rapid/rapid.py:2140
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"%(problem)s"
+"These download folders are invalid:\n"
+"%(folder1)s\n"
+"%(folder2)s"
 msgstr ""
 
-#: rapid/rapid.py:2171 rapid/rapid.py:2517 rapid/rapid.py:2552
-#: rapid/rapid.py:2580 rapid/rapid.py:2611 rapid/rapid.py:2630
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
-msgstr ""
-"Font : %(source)s\n"
-"Destinacion : %(destination)s"
-
-#. hopefully inst will never be None, but just to be safe...
-#: rapid/rapid.py:2186
-msgid "Please check your system and try again."
-msgstr ""
-
-#: rapid/rapid.py:2206
-msgid "Photos detected with the same filenames, but taken at different times"
+"This download folder is invalid:\n"
+"%s"
 msgstr ""
 
-#: rapid/rapid.py:2246
-msgid "Photo has already been downloaded"
-msgstr ""
-
-#: rapid/rapid.py:2247 rapid/rapid.py:2646
-#, python-format
-msgid "Source: %(source)s"
-msgstr "Font : %(source)s"
-
-#. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:2445
-msgid "New day has started - resetting 'Downloads Today' sequence number"
-msgstr ""
-
-#: rapid/rapid.py:2516
-#, python-format
-msgid "Backup of %(file_type)s already exists"
-msgstr ""
+#: rapid/rapid.py:2380
+msgid "Download cannot proceed"
+msgstr "Impossible de procedir al transferiment"
 
-#: rapid/rapid.py:2520
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
 #, python-format
-msgid "Backup %(file_type)s overwritten"
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
 msgstr ""
 
-#: rapid/rapid.py:2524
-#, python-format
-msgid "%(file_type)s not backed up to %(volume)s"
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
 msgstr ""
 
-#: rapid/rapid.py:2526
-#, python-format
-msgid "%(file_type)s not backed up"
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
 msgstr ""
 
-#: rapid/rapid.py:2549 rapid/rapid.py:2577 rapid/rapid.py:2610
-#: rapid/rapid.py:2629
-msgid "Backing up error"
+#: rapid/rapid.py:2393
+msgid "Backup problem"
 msgstr ""
 
-#: rapid/rapid.py:2550 rapid/rapid.py:2578
-#, python-format
-msgid "Destination directory could not be created: %(directory)s\n"
+#: rapid/rapid.py:2802
+msgid "About 1 second remaining"
 msgstr ""
 
-#: rapid/rapid.py:2554 rapid/rapid.py:2613
+#: rapid/rapid.py:2804
 #, python-format
-msgid "Error: %(inst)s"
+msgid "About %i seconds remaining"
 msgstr ""
 
-#: rapid/rapid.py:2555 rapid/rapid.py:2583 rapid/rapid.py:2614
-#: rapid/rapid.py:2633
-#, python-format
-msgid "The %(file_type)s was not backed up."
+#: rapid/rapid.py:2806
+msgid "About 1 minute remaining"
 msgstr ""
 
-#: rapid/rapid.py:2582 rapid/rapid.py:2632
-#, python-format
-msgid "Error: %(errno)s %(strerror)s"
-msgstr "Error: %(errno)s %(strerror)s"
-
-#: rapid/rapid.py:2645
+#. 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:2811
 #, python-format
-msgid "%(file_type)s could not be backed up"
-msgstr ""
-
-#: rapid/rapid.py:2648
-msgid "No suitable backup volume was found"
+msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr ""
 
-#: rapid/rapid.py:2650
-msgid "A backup location was not found"
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
+msgid "photos and videos"
 msgstr ""
 
-#: rapid/rapid.py:2704
-#, python-format
-msgid "This device has no %(types_searched_for)s to download from."
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
+msgid "photos or videos"
 msgstr ""
 
-#: rapid/rapid.py:2777
-#, python-format
-msgid "Download has started from %s"
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
+msgid "video"
 msgstr ""
 
-#: rapid/rapid.py:2780
-#, python-format
-msgid "Attempting to download %s files"
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
+msgid "photo"
 msgstr ""
 
-#. reset the progress bar to update the status of this download attempt
-#: rapid/rapid.py:2813 rapid/rapid.py:2880
+#: rapid/rapid.py:2872
 #, python-format
-msgid "%(number)s of %(total)s %(filetypes)s"
+msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
 #: rapid/rapid.py:2876
 #, python-format
-msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
+msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: rapid/rapid.py:2901 rapid/rapid.py:2905
-msgid "Could not delete photo or video from device"
-msgstr ""
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
+msgid "warnings"
+msgstr "avertiments"
 
-#: rapid/rapid.py:2902
-#, python-format
-msgid ""
-"Photo: %(source)s\n"
-"Error: %(errno)s %(strerror)s"
+#: rapid/rapid.py:2892
+msgid "All downloads complete"
 msgstr ""
 
-#: rapid/rapid.py:2906
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
-msgid "Photo: %(source)s"
+msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: rapid/rapid.py:2908
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
-msgid "Deleted %(number)i %(filetypes)s from device"
+msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2921
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
-msgid "Download complete from %s"
-msgstr ""
-
-#. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:3036 rapid/rapid.py:3505
-msgid "Device"
-msgstr "Periferic"
-
-#. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:3041 rapid/rapid.py:3494
-msgid "Size"
-msgstr "Talha"
-
-#: rapid/rapid.py:3044
-msgid "Download Progress"
-msgstr "Progression del telecargament"
-
-#: rapid/rapid.py:3132
-msgid "Downloading From Cameras"
-msgstr ""
-
-#: rapid/rapid.py:3138
-msgid "Downloading directly from a camera may work poorly or not at all"
-msgstr ""
-
-#: rapid/rapid.py:3139
-msgid ""
-"Downloading from a card reader always works and is generally much faster. It "
-"is strongly recommended to use a card reader."
-msgstr ""
-
-#: rapid/rapid.py:3153
-msgid "_Show this message again"
-msgstr ""
-
-#: rapid/rapid.py:3188
-msgid "Device Detected"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3197
-msgid ""
-"Should this device or partition be used to download photos or videos from?"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3216
-msgid "_Remember this choice"
+msgid "%(filetype)s failed to download"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3253
+#. e.g.: 3 of 205 photos and videos (202 remaining)
+#: rapid/rapid.py:2970
 #, python-format
-msgid "%s selected for downloading from"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3256
-msgid "This device or partition will always be used to download from"
+msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3259
+#. e.g.: 205 of 205 photos and videos
+#: rapid/rapid.py:2977
 #, python-format
-msgid "%s rejected as a download device"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3262
-msgid "This device or partition will never be used to download from"
-msgstr ""
-
-#: rapid/rapid.py:3269
-msgid "Remove all Job Codes?"
-msgstr ""
-
-#: rapid/rapid.py:3286
-msgid "Should all Job Codes be removed?"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3314
-msgid "Enter a Job Code"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3333
-msgid "Enter a new Job Code, or select a previous one"
+msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3336
-msgid "Enter a new Job Code"
+#: rapid/rapid.py:3331
+msgid "From"
 msgstr ""
 
-#: rapid/rapid.py:3341 rapid/rapid.py:4496
-msgid "Job Code:"
+#: rapid/rapid.py:3339
+msgid "Auto Detect"
 msgstr ""
 
-#: rapid/rapid.py:3388
-msgid "Job Code entered"
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
+#, python-format
+msgid "Select a folder containing %(file_types)s"
 msgstr ""
 
-#: rapid/rapid.py:3390
-msgid "Job Code not entered"
+#: rapid/rapid.py:3384
+msgid "Copy"
 msgstr ""
 
-#: rapid/rapid.py:3440
-msgid "Status"
+#: rapid/rapid.py:3397
+msgid "Move"
 msgstr ""
 
-#: rapid/rapid.py:3448
-msgid "Type"
+#: rapid/rapid.py:3419
+msgid "To"
 msgstr ""
 
-#: rapid/rapid.py:3457 rapid/rapid.py:4921 rapid/rapid.py:4923
-msgid "Photo"
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
+msgid "Photos:"
 msgstr ""
 
-#: rapid/rapid.py:3459
-msgid "File"
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
+msgid "Select a folder to download photos to"
 msgstr ""
 
-#: rapid/rapid.py:3474
-msgid "Job Code"
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
+msgid "Videos:"
 msgstr ""
 
-#: rapid/rapid.py:3484
-msgid "Date"
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
+msgid "Select a folder to download videos to"
 msgstr ""
 
-#: rapid/rapid.py:3516 rapid/renamesubfolderprefs.py:194
-msgid "Filename"
-msgstr "Nom del fichièr"
-
-#: rapid/rapid.py:3527
-msgid "Path"
-msgstr ""
+#: rapid/rapid.py:3650
+msgid "and"
+msgstr "e"
 
-#: rapid/rapid.py:3918
-#, python-format
-msgid "%(filetype)s was downloaded successfully"
+#: rapid/rapid.py:3655
+msgid "Using backup devices"
 msgstr ""
 
-#: rapid/rapid.py:3920
-#, python-format
-msgid "%(filetype)s was not downloaded"
+#: rapid/rapid.py:3657
+msgid "Using backup device"
 msgstr ""
 
-#: rapid/rapid.py:3922
-#, python-format
-msgid "%(filetype)s was downloaded with warnings"
+#: rapid/rapid.py:3659
+msgid "No backup devices detected"
 msgstr ""
 
-#: rapid/rapid.py:3924
-#, python-format
-msgid "%(filetype)s was downloaded but there were problems backing up"
+#: rapid/rapid.py:3686
+msgid "Free space:"
 msgstr ""
 
-#: rapid/rapid.py:3926
+#. (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:3698
 #, python-format
-msgid "%(filetype)s was neither downloaded nor backed up"
+msgid "(%(file_type)s)"
 msgstr ""
 
-#: rapid/rapid.py:3928
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#: rapid/rapid.py:3702
 #, python-format
-msgid "%(filetype)s is ready to be downloaded"
+msgid "%(free)s %(file_type)s"
 msgstr ""
 
-#: rapid/rapid.py:3930
-#, python-format
-msgid "%(filetype)s is about to be downloaded"
+#. Inserted in the middle of the statusbar message concerning the amount of freespace
+#. Used to differentiate between two different file systems
+#. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
+#: rapid/rapid.py:3707
+msgid "; "
 msgstr ""
 
-#: rapid/rapid.py:3932
-#, python-format
-msgid "%(filetype)s will be downloaded with warnings"
+#. Inserted at the end of the statusbar message concerning the amount of freespace
+#. Used to differentiate between two different file systems
+#. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
+#: rapid/rapid.py:3712
+msgid "."
 msgstr ""
 
-#: rapid/rapid.py:3934
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#. e.g. 14.7GB available
+#: rapid/rapid.py:3718
 #, python-format
-msgid "%(filetype)s cannot be downloaded"
-msgstr ""
-
-#: rapid/rapid.py:4303
-msgid "Preview"
-msgstr ""
-
-#: rapid/rapid.py:4518
-msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
+msgid "%(free)s free"
 msgstr ""
 
-#: rapid/rapid.py:4887
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3726
 #, python-format
-msgid "%(free)s available"
+msgid "Backing up photos and videos to %(path)s"
 msgstr ""
 
 #. user manually specified backup location
-#: rapid/rapid.py:4894
+#: rapid/rapid.py:3729
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr ""
 
-#: rapid/rapid.py:4899
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3732
 #, python-format
-msgid "%(freespace)s. %(backuppaths)s."
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr ""
 
-#: rapid/rapid.py:4908
+#: rapid/rapid.py:3739
 #, python-format
-msgid ""
-"Sorry, this device location does not exist:\n"
-"%(path)s\n"
-"\n"
-"Please resolve the problem, or modify your preferences."
+msgid "%(freespace)s. %(backuppaths)s."
 msgstr ""
 
-#: rapid/rapid.py:4912
-msgid "Problem with Device Location Folder"
+#: rapid/rapid.py:3768
+msgid "Program preferences are invalid"
 msgstr ""
 
-#: rapid/rapid.py:4921
-msgid "Video"
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
+msgid "Photo"
 msgstr ""
 
-#: rapid/rapid.py:4928
-#, python-format
-msgid "The %(file_type)s Download Folder does not exist.\n"
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
+msgid "Video"
 msgstr ""
 
-#: rapid/rapid.py:4937
+#: rapid/rapid.py:3921
 #, python-format
-msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
-msgstr ""
-
-#: rapid/rapid.py:4942
-msgid ""
-"Sorry, problems were encountered with your download folders. Please fix the "
-"problems or modify the preferences.\n"
-"\n"
-msgstr ""
-
-#: rapid/rapid.py:4945
-msgid "Problem with Download Folder"
-msgstr ""
-
-#: rapid/rapid.py:4947
-msgid "Problem with Download Folders"
-msgstr ""
-
-#: rapid/rapid.py:4960
-msgid "Some preferences will be reset."
+msgid "%(file_type)s download folder does not exist"
 msgstr ""
 
-#: rapid/rapid.py:4993
-msgid "Displaying warning about downloading directly from camera"
-msgstr ""
-
-#: rapid/rapid.py:5003
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
-msgid "Prompting whether to use %s"
-msgstr ""
-
-#: rapid/rapid.py:5030
-msgid "Prompting for Job Code"
-msgstr ""
-
-#: rapid/rapid.py:5034
-msgid "Already prompting for Job Code, do not prompt again"
-msgstr ""
-
-#: rapid/rapid.py:5051
-msgid "Starting downloads"
-msgstr ""
-
-#. autostart is true
-#: rapid/rapid.py:5055
-msgid "Starting downloads that have been waiting for a Job Code"
+msgid "Folder: %s"
 msgstr ""
 
-#: rapid/rapid.py:5102
+#: rapid/rapid.py:3935
 #, python-format
-msgid "Creating photo download folder %(folder)s"
+msgid "%(file_type)s download folder is invalid"
 msgstr ""
 
-#: rapid/rapid.py:5107
+#: rapid/rapid.py:3948
 #, python-format
-msgid "Failed to create default photo download folder %(folder)s"
+msgid "%(file_type)s download folder is not writable"
 msgstr ""
 
-#: rapid/rapid.py:5111
-#, python-format
-msgid "Creating video download folder %(folder)s"
+#: rapid/rapid.py:4034
+msgid "Thumbnails"
 msgstr ""
 
-#: rapid/rapid.py:5116
+#. 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:4089
 #, python-format
-msgid "Failed to create default video download folder %(folder)s"
-msgstr ""
-
-#: rapid/rapid.py:5141
 msgid ""
-"A newer version of this program was previously run on this computer.\n"
-"\n"
-msgstr ""
-
-#: rapid/rapid.py:5143
-msgid ""
-"Program preferences appear to be valid, but please check them to ensure "
-"correct operation."
+"display program information on the command line as the program runs "
+"(default: %default)"
 msgstr ""
 
-#: rapid/rapid.py:5145
-msgid "Sorry, some preferences are invalid and will be reset."
+#: rapid/rapid.py:4090
+msgid "display debugging information when run from the command line"
 msgstr ""
 
-#: rapid/rapid.py:5146
-msgid "Warning:"
-msgstr "Avertiment :"
-
-#: rapid/rapid.py:5151
-msgid ""
-"This version of the program is newer than the previously run version. "
-"Checking preferences."
+#: rapid/rapid.py:4091
+msgid "only output errors to the command line"
 msgstr ""
 
-#: rapid/rapid.py:5158
-msgid "Preferences were modified."
+#. image file extensions are recognized RAW files plus TIFF and JPG
+#: rapid/rapid.py:4093
+msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 
-#: rapid/rapid.py:5159
+#: rapid/rapid.py:4095
 msgid ""
-"This version of the program uses different preferences than the old version. "
-"Your preferences have been updated.\n"
-"\n"
-"Please check them to ensure correct operation."
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
 msgstr ""
 
-#: rapid/rapid.py:5163
-msgid "No preferences needed to be changed."
-msgstr ""
-
-#: rapid/rapid.py:5165
+#: rapid/rapid.py:4096
 msgid ""
-"This version of the program uses different preferences than the old version. "
-"Some of your previous preferences were invalid, and could not be updated. "
-"They will be reset."
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
 msgstr ""
 
-#: rapid/rapid.py:5175
-msgid "Problem using pynotify."
-msgstr "Problèma d'utilizacion de pynotify"
-
-#: rapid/rapid.py:5191
-msgid "Failed to receive pynotify server capabilities."
+#: rapid/rapid.py:4097
+msgid "reset all program settings and preferences and exit"
 msgstr ""
 
-#: rapid/rapid.py:5202
+#: rapid/rapid.py:4110
 msgid ""
-"Warning: desktop environment notification server is incorrectly configured."
-msgstr ""
-
-#: rapid/rapid.py:5250
-msgid "and"
-msgstr "e"
-
-#: rapid/rapid.py:5255
-msgid "Using backup devices"
-msgstr ""
-
-#: rapid/rapid.py:5257
-msgid "Using backup device"
-msgstr ""
-
-#: rapid/rapid.py:5259
-msgid "No backup devices detected"
-msgstr ""
-
-#: rapid/rapid.py:5309 rapid/rapid.py:5471
-#, python-format
-msgid "Device %(device)s (%(path)s) ignored"
+"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:5430
+#: rapid/rapid.py:4133
 #, python-format
-msgid "Detected %(device)s with path %(path)s"
-msgstr ""
-
-#: rapid/rapid.py:5434
-msgid "Automatically start download is true"
-msgstr ""
+msgid "and %s"
+msgstr "e %s"
 
-#: rapid/rapid.py:5436
-msgid "Automatically start download is false"
+#: rapid/rapid.py:4141
+msgid "All settings and preferences have been reset"
 msgstr ""
 
-#: rapid/rapid.py:5489
-msgid "Using manually specified path"
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
+msgid "Backing up error"
 msgstr ""
 
-#. the user is trying to backup to a device that is currently being downloaded from..... we don't normally allow that, but what to do?
-#: rapid/rapid.py:5557
+#: rapid/backupfile.py:151
 #, python-format
-msgid "Warning: backup device %(device)s is currently being downloaded from"
-msgstr ""
-
-#: rapid/rapid.py:5573
-msgid "D_ownload Selected"
-msgstr ""
-
-#: rapid/rapid.py:5665 rapid/rapid.py:5716
-msgid "All downloads complete"
-msgstr ""
-
-#: rapid/rapid.py:5680
-msgid "MB/s"
-msgstr "Mio/s"
-
-#: rapid/rapid.py:5690
-msgid "About 1 second remaining"
+msgid "Destination directory could not be created: %(directory)s\n"
 msgstr ""
 
-#: rapid/rapid.py:5692
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
-msgid "About %i seconds remaining"
-msgstr ""
-
-#: rapid/rapid.py:5694
-msgid "About 1 minute remaining"
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
 msgstr ""
+"Font : %(source)s\n"
+"Destinacion : %(destination)s"
 
-#. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
-#. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
-#. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:5699
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
-msgid "About %(minutes)i:%(seconds)02i minutes remaining"
+msgid "Error: %(inst)s"
 msgstr ""
 
-#: rapid/rapid.py:5719 rapid/rapid.py:5725 rapid/rapid.py:5731
-#: rapid/rapid.py:5737 rapid/rapid.py:5742 rapid/rapid.py:5746
+#: rapid/backupfile.py:163
 #, python-format
-msgid "%(number)s %(numberdownloaded)s"
+msgid "Backup %(file_type)s overwritten"
 msgstr ""
 
-#: rapid/rapid.py:5721 rapid/rapid.py:5733
+#: rapid/backupfile.py:166
 #, python-format
-msgid "%(filetype)s downloaded"
+msgid "%(file_type)s not backed up"
 msgstr ""
 
-#: rapid/rapid.py:5727 rapid/rapid.py:5739
+#: rapid/backupfile.py:168
 #, python-format
-msgid "%(filetype)s failed to download"
-msgstr ""
-
-#: rapid/rapid.py:5907
-msgid "_Resume"
-msgstr ""
-
-#: rapid/rapid.py:5910
-msgid "_Download All"
-msgstr ""
-
-#. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:5919
-msgid "_Pause"
-msgstr "_Pausa"
-
-#: rapid/rapid.py:6031
-msgid "Download device settings preferences were changed."
-msgstr ""
-
-#: rapid/rapid.py:6043
-msgid "Backup preferences were changed."
-msgstr ""
-
-#: rapid/rapid.py:6049
-msgid "Subfolder and filename preferences were changed."
-msgstr ""
-
-#: rapid/rapid.py:6060
-msgid "Download folder preferences were changed."
+msgid "Backup of %(file_type)s already exists"
 msgstr ""
 
-#: rapid/rapid.py:6259
-msgid "Goodbye"
-msgstr "Al reveire"
-
-#. Translators: this text is displayed to the user when they request information on the command line options.
-#. The text %default should not be modified or left out.
-#: rapid/rapid.py:6270
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
-"display program information on the command line as the program runs "
-"(default: %default)"
-msgstr ""
-
-#: rapid/rapid.py:6271
-msgid "only output errors to the command line"
-msgstr ""
-
-#. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:6273
-msgid "list photo and video file extensions the program recognizes and exit"
+"%(problem)s\n"
+"File: %(file)s"
 msgstr ""
 
-#: rapid/rapid.py:6274
-msgid "reset all program settings and preferences and exit"
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
 msgstr ""
 
-#: rapid/rapid.py:6283
-msgid "Photos:"
+#: rapid/device.py:80
+msgid "Device Detected"
 msgstr ""
 
-#: rapid/rapid.py:6283
-msgid "Videos:"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/device.py:89
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
 msgstr ""
 
-#: rapid/rapid.py:6288
-#, python-format
-msgid "and %s"
-msgstr "e %s"
-
-#: rapid/rapid.py:6296
-msgid "All settings and preferences have been reset"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/device.py:108
+msgid "_Remember this choice"
 msgstr ""
 
-#. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:6300 rapid/rapid.py:6301 rapid/rapid.py:6303
-#: rapid/rapid.py:6308 rapid/rapid.py:6312
-msgid "Using"
-msgstr "En utilizacion"
-
-#: rapid/rapid.py:6305
-msgid "\n"
-msgstr "\n"
-
-#. this application is already running
-#: rapid/rapid.py:6329
-#, python-format
-msgid "%s is already running"
-msgstr ""
+#: rapid/downloadtracker.py:299
+msgid "MB/s"
+msgstr "Mio/s"
 
-#: rapid/renamesubfolderprefs.py:192
+#: rapid/generatenameconfig.py:151
 msgid "Date time"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:193
+#: rapid/generatenameconfig.py:152
 msgid "Text"
 msgstr "Tèxte"
 
-#: rapid/renamesubfolderprefs.py:195
+#: rapid/generatenameconfig.py:153
+msgid "Filename"
+msgstr "Nom del fichièr"
+
+#: rapid/generatenameconfig.py:154
 msgid "Metadata"
 msgstr "Metadonadas"
 
-#: rapid/renamesubfolderprefs.py:196
+#: rapid/generatenameconfig.py:155
 msgid "Sequences"
 msgstr "Sequéncias"
 
-#: rapid/renamesubfolderprefs.py:199
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/generatenameconfig.py:157 rapid/preferencesdialog.py:577
+msgid "Job code"
+msgstr "Etiqueta de transferiment"
+
+#: rapid/generatenameconfig.py:158
 msgid "Image date"
 msgstr "Data de l'imatge"
 
-#: rapid/renamesubfolderprefs.py:200
+#: rapid/generatenameconfig.py:159
 msgid "Video date"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:201
+#: rapid/generatenameconfig.py:160
 msgid "Today"
 msgstr "Uèi"
 
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/generatenameconfig.py:161
 msgid "Yesterday"
 msgstr "Ièr"
 
+#. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
+#: rapid/generatenameconfig.py:163
+msgid "Download time"
+msgstr ""
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:204
+#: rapid/generatenameconfig.py:165
 msgid "Name + extension"
 msgstr "Nom + extension"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:206
+#: rapid/generatenameconfig.py:167
 msgid "Name"
 msgstr "Nom"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:208
+#: rapid/generatenameconfig.py:169
 msgid "Extension"
 msgstr "Extension"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:210
+#: rapid/generatenameconfig.py:171
 msgid "Image number"
 msgstr "Numèro de l'imatge"
 
-#: rapid/renamesubfolderprefs.py:211
+#: rapid/generatenameconfig.py:172
 msgid "Video number"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:213
+#: rapid/generatenameconfig.py:174
 msgid "Aperture"
 msgstr "Dobertura"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:215
+#: 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/renamesubfolderprefs.py:217
+#: rapid/generatenameconfig.py:178
 msgid "Exposure time"
 msgstr "Temps d'exposicion"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:219
+#: rapid/generatenameconfig.py:180
 msgid "Focal length"
 msgstr "Distància focala"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:221
+#: rapid/generatenameconfig.py:182
 msgid "Camera make"
 msgstr "Marca de l'aparelh"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:223
+#: rapid/generatenameconfig.py:184
 msgid "Camera model"
 msgstr "Modèl d'aparelh de fòto"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:225
+#: 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/renamesubfolderprefs.py:227
+#: 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/renamesubfolderprefs.py:229
+#: rapid/generatenameconfig.py:190
 msgid "Serial number"
 msgstr "Numèro de seria"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:231
+#: rapid/generatenameconfig.py:192
 msgid "Shutter count"
 msgstr ""
 
+#. File number currently refers to the Exif value Exif.Canon.FileNumber
+#: rapid/generatenameconfig.py:194
+msgid "File number"
+msgstr ""
+
+#. Only the folder component of the Exif.Canon.FileNumber value
+#: rapid/generatenameconfig.py:196
+msgid "Folder only"
+msgstr ""
+
+#. The folder and file component of the Exif.Canon.FileNumber value
+#: rapid/generatenameconfig.py:198
+msgid "Folder and file"
+msgstr ""
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:233
+#: rapid/generatenameconfig.py:200
 msgid "Owner name"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:234
+#: rapid/generatenameconfig.py:201
 msgid "Codec"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:235
+#: rapid/generatenameconfig.py:202
 msgid "Width"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:236
+#: rapid/generatenameconfig.py:203
 msgid "Height"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:237
+#: rapid/generatenameconfig.py:204
 msgid "Length"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/generatenameconfig.py:205
 msgid "Frames Per Second"
 msgstr ""
 
+#: rapid/generatenameconfig.py:206
+msgid "Artist"
+msgstr ""
+
+#: 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/renamesubfolderprefs.py:240
+#: 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/renamesubfolderprefs.py:242
+#: 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/renamesubfolderprefs.py:244
+#: 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/renamesubfolderprefs.py:246
+#: 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/renamesubfolderprefs.py:248
+#: 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/renamesubfolderprefs.py:250
+#: 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/renamesubfolderprefs.py:252
+#: 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/renamesubfolderprefs.py:254
+#: 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/renamesubfolderprefs.py:256
+#: 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/renamesubfolderprefs.py:258
+#: 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/renamesubfolderprefs.py:260
+#: 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/renamesubfolderprefs.py:262
+#: rapid/generatenameconfig.py:231
 msgid "UPPERCASE"
 msgstr "MAJUSCULA"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:264
+#: rapid/generatenameconfig.py:233
 msgid "lowercase"
 msgstr "minuscula"
 
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/generatenameconfig.py:234
 msgid "One digit"
 msgstr "Una chifra"
 
-#: rapid/renamesubfolderprefs.py:266
+#: rapid/generatenameconfig.py:235
 msgid "Two digits"
 msgstr "Doas chifras"
 
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/generatenameconfig.py:236
 msgid "Three digits"
 msgstr "Tres chifras"
 
-#: rapid/renamesubfolderprefs.py:268
+#: rapid/generatenameconfig.py:237
 msgid "Four digits"
 msgstr "Quatre chifras"
 
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/generatenameconfig.py:238
 msgid "Five digits"
 msgstr "Cinc chifras"
 
-#: rapid/renamesubfolderprefs.py:270
+#: rapid/generatenameconfig.py:239
 msgid "Six digits"
 msgstr "Sièis chifras"
 
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/generatenameconfig.py:240
 msgid "Seven digits"
 msgstr "Sèt chifras"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: 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/renamesubfolderprefs.py:275
+#: rapid/generatenameconfig.py:244
 msgid "YYYYMMDD"
 msgstr "AAAAMMJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/generatenameconfig.py:246
 msgid "YYYY-MM-DD"
 msgstr "AAA-MM-JJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/generatenameconfig.py:248
 msgid "YYMMDD"
 msgstr "AAMMJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/generatenameconfig.py:250
 msgid "YY-MM-DD"
 msgstr "AA-MM-JJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/generatenameconfig.py:252
 msgid "MMDDYYYY"
 msgstr "MM-JJ-AAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/generatenameconfig.py:254
 msgid "MMDDYY"
 msgstr "MM-JJ-AA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/generatenameconfig.py:256
 msgid "MMDD"
 msgstr "MMJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/generatenameconfig.py:258
 msgid "DDMMYYYY"
 msgstr "JJMMAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/generatenameconfig.py:260
 msgid "DDMMYY"
 msgstr "JJMMAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
+#: 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/renamesubfolderprefs.py:295
+#: 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/renamesubfolderprefs.py:297
+#: 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/renamesubfolderprefs.py:299
+#: rapid/generatenameconfig.py:268
 msgid "DD"
 msgstr "JJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:301
+#: 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 "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:303
+#: 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/renamesubfolderprefs.py:305
+#: 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/renamesubfolderprefs.py:307
+#: 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/renamesubfolderprefs.py:309
+#: 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/renamesubfolderprefs.py:311
+#: rapid/generatenameconfig.py:284
 msgid "MM (minutes)"
 msgstr "MM (minutas)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:313
+#: rapid/generatenameconfig.py:286
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:796
+#: rapid/preferencesdialog.py:374
 #, python-format
-msgid ""
-"Preference key '%(key)s' is invalid.\n"
-"Expected one of %(value)s"
+msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:803
+#: rapid/preferencesdialog.py:376
 #, python-format
-msgid "Preference value '%(value)s' is invalid"
+msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:807
-msgid "These preferences are not well formed:"
+#: rapid/preferencesdialog.py:380
+#, python-format
+msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1517
-#, python-format
-msgid "Subfolder preferences should not start with a %s"
+#: rapid/preferencesdialog.py:439 rapid/preferencesdialog.py:700
+msgid "Remove all Job Codes?"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1519
-#, python-format
-msgid "Subfolder preferences should not end with a %s"
+#: rapid/preferencesdialog.py:440 rapid/preferencesdialog.py:717
+msgid "Should all Job Codes be removed?"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1523
-#, python-format
-msgid "Subfolder preferences should not contain two %s one after the other"
+#: rapid/preferencesdialog.py:446
+msgid "Remove all Remembered Paths?"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:1
-msgid " "
-msgstr " "
+#: rapid/preferencesdialog.py:447
+msgid "Should all remembered paths be removed?"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:2
-msgid "      "
-msgstr "      "
+#: rapid/preferencesdialog.py:453
+msgid "Remove all Ignored Paths?"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:3
-msgid " hh:mm"
-msgstr " hh:mm"
+#: rapid/preferencesdialog.py:454
+msgid "Should all ignored paths be removed?"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:4
-msgid ":"
-msgstr ":"
+#: rapid/preferencesdialog.py:465
+msgid "Error in Photo Rename preferences"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:5
-msgid "<b>Backup</b>"
+#: rapid/preferencesdialog.py:645
+msgid "Error in Video Rename preferences"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:6
-msgid "<b>Compatibility with Other Operating Systems</b>"
+#: rapid/preferencesdialog.py:666
+msgid "Error in Photo Download Subfolders preferences"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:7
-msgid "<b>Devices</b>"
+#: rapid/preferencesdialog.py:683
+msgid "Error in Video Download Subfolders preferences"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:8
-msgid "<b>Download Folder</b>"
-msgstr "<b>Dorsièr de destinacion</b>"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:742
+msgid "Enter a Job Code"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:9
-msgid "<b>Download Subfolders</b>"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:758
+msgid "Enter a new Job Code, or select a previous one"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:10
-msgid "<b>Example</b>"
-msgstr "<b>Exemple</b>"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:761
+msgid "Enter a new Job Code"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:11
-msgid "<b>Job Codes</b>"
+#: rapid/preferencesdialog.py:766
+msgid "Job Code:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:12
-msgid "<b>Photo Rename</b>"
+#: rapid/preferencesdialog.py:822
+msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:13
-msgid "<b>Photo and Video Name Conflicts</b>"
+#: rapid/preferencesdialog.py:834
+msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:14
-msgid "<b>Program Automation</b>"
+#: rapid/preferencesdialog.py:839
+msgid "Path:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:15
-msgid "<b>Sequence Numbers</b>"
+#: rapid/preferencesdialog.py:1092
+msgid "Job Code"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:16
-msgid "<i>/media/externaldrive/Photos</i>"
+#: rapid/preferencesdialog.py:1363
+msgid "Select a folder in which to backup photos"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:17
-msgid "<i>Example: /home/user/Pictures</i>"
+#: rapid/preferencesdialog.py:1376
+msgid "Select a folder in which to backup videos"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:18
-msgid "<i>Example:</i>"
-msgstr "<i>Exemple :</i>"
+#. 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:1473
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:19
-msgid "<i>New:</i>"
+#: rapid/preferencesdialog.py:1524
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
+"subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:20
-msgid "<i>Original:</i>"
-msgstr "<i>Original :</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:1527
+#, python-format
+msgid "<i>Example: %s</i>"
+msgstr "<i>Exemple : %s</i>"
 
-#: rapid/glade3/rapid.glade.h:21
-msgid "<span weight=\"bold\" size=\"x-large\">Automation</span>"
+#. Preferences list is now empty
+#: rapid/preferencesdialog.py:1617
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
+"They will be reset to their default values."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:22
-msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+#: rapid/preferencesdialog.py:1762
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:23
-msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+#: rapid/preferencesdialog.py:1764
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Gestion de las errors</span>"
+#: rapid/preferencesdialog.py:1765
+msgid "Invalid regular expression"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:25
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1949
+msgid "externaldrive1"
+msgstr "discextèrne1"
+
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1951
+msgid "externaldrive2"
+msgstr "discextèrne2"
+
+#: rapid/prefsrapid.py:127
+msgid "New York"
+msgstr "Nòva York"
+
+#: rapid/prefsrapid.py:128
+msgid "Manila"
+msgstr "Manilha"
+
+#: rapid/prefsrapid.py:128
+msgid "Prague"
+msgstr "Praga"
+
+#: rapid/prefsrapid.py:128
+msgid "Helsinki"
+msgstr "Helsinki"
+
+#: rapid/prefsrapid.py:128
+msgid "Wellington"
+msgstr "Wellington"
+
+#: rapid/prefsrapid.py:129
+msgid "Tehran"
+msgstr "Teheran"
+
+#: rapid/prefsrapid.py:129
+msgid "Kampala"
+msgstr "Kampala"
+
+#: rapid/prefsrapid.py:129
+msgid "Paris"
+msgstr "París"
+
+#: rapid/prefsrapid.py:129
+msgid "Berlin"
+msgstr "Berlin"
+
+#: rapid/prefsrapid.py:129
+msgid "Sydney"
+msgstr "Sydney"
+
+#: rapid/prefsrapid.py:130
+msgid "Budapest"
+msgstr "Budapèst"
+
+#: rapid/prefsrapid.py:130
+msgid "Rome"
+msgstr "Roma"
+
+#: rapid/prefsrapid.py:130
+msgid "Moscow"
+msgstr "Moscòu"
+
+#: rapid/prefsrapid.py:130
+msgid "Delhi"
+msgstr "Delhi"
+
+#: rapid/prefsrapid.py:130
+msgid "Warsaw"
+msgstr "Varsòvia"
+
+#: rapid/prefsrapid.py:131
+msgid "Jakarta"
+msgstr "Jakarta"
+
+#: rapid/prefsrapid.py:131
+msgid "Madrid"
+msgstr "Madrid"
+
+#: rapid/prefsrapid.py:131
+msgid "Stockholm"
+msgstr "Estocòlme"
+
+#. components
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
+msgid "subfolder"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
+msgid "filename"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+#: rapid/problemnotification.py:85
+#, python-format
+msgid "Date time value %s appears invalid."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
+#: rapid/problemnotification.py:86
+msgid "Filename does not have an extension."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:29
-msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+#. a number component is something like the 8346 in IMG_8346.JPG
+#: rapid/problemnotification.py:88
+msgid "Filename does not have a number component."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:30
-msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+#: rapid/problemnotification.py:89
+#, python-format
+msgid "Error generating component %s."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:31
-msgid "Add unique identifier"
+#. a generic problem
+#: rapid/problemnotification.py:91
+#, python-format
+msgid "%(filetype)s metadata cannot be read"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:32
-msgid "Automatically detect Portable Storage Devices"
+#: rapid/problemnotification.py:93
+#, python-format
+msgid "%(filetype)s %(area)s could not be generated"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:33
-msgid "Automatically detect backup devices"
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
+#, python-format
+msgid "An error occurred when copying the %(filetype)s"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:34
-msgid "Automatically detect devices"
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:35
-msgid "Automation"
-msgstr "Automatizacion"
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
+#, python-format
+msgid "%(filetype)s already exists"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:36
-msgid "Backup"
-msgstr "Salvament"
+#: rapid/problemnotification.py:105
+#, python-format
+msgid ""
+"%(filetype)s could not be backed up because no suitable backup locations "
+"were found."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:37
-msgid "Backup location:"
+#: rapid/problemnotification.py:110
+#, 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/glade3/rapid.glade.h:38
-msgid "Backup photos and videos when downloading"
+#: rapid/problemnotification.py:111
+#, python-format
+msgid "%(filetype)s was already downloaded"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:39
+#: rapid/problemnotification.py:115
+#, python-format
 msgid ""
-"Choose the download folder. Subfolders for the downloaded photos will be "
-"automatically created in this folder using the structure specified below."
+"The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+"identifier '%(identifier)s' added."
+msgstr ""
+
+#: rapid/problemnotification.py:116
+#, python-format
+msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
+msgstr ""
+
+#: rapid/problemnotification.py:117
+#, python-format
+msgid "There is no data with which to name the %(filetype)s."
+msgstr ""
+
+#: rapid/problemnotification.py:119
+#, python-format
+msgid "Error: %(errorno)s %(strerror)s"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:40
+#: rapid/problemnotification.py:210
 msgid ""
-"Choose the download folder. Subfolders for the downloaded videos will be "
-"automatically created in this folder using the structure specified below."
+"File verification failed. The downloaded version is different from the "
+"original."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-10"
-msgstr "Copyright Damon Lynch 2007-10"
+#: rapid/problemnotification.py:213
+msgid "The metadata might be corrupt."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:42
-msgid "Day start:"
+#: rapid/problemnotification.py:216
+msgid ""
+"The filename, extension and Exif information indicate it has already been "
+"downloaded."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:43
-msgid "Delete photos and videos from device upon download completion"
+#: rapid/problemnotification.py:235
+#, python-format
+msgid " It was backed up to %(volume)s"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:44
-msgid "Devices"
+#: rapid/problemnotification.py:237
+msgid " It was backed up to these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
+#, python-format
+msgid "%s, "
+msgstr ""
+
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
+#, python-format
+msgid "%(volumes)s and %(final_volume)s."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:45
+#: rapid/problemnotification.py:252
+#, python-format
 msgid ""
-"Devices are from where to download photos and videos, such as cameras, "
-"memory cards or Portable Storage Devices.\n"
-"\n"
-"You can download photos from multiple devices simultaneously, or you can "
-"specify a location on your hard drive.\n"
-"\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
+"Photos detected with the same filenames, but taken at different times: "
+"%(details)s"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Download / Pause"
-msgstr "Transferiment / Pausa"
+#: rapid/problemnotification.py:269
+#, python-format
+msgid "An error occurred when backing up on %(volume)s: %(inst)s."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:51
-msgid "Download folder:"
+#: rapid/problemnotification.py:271
+#, python-format
+msgid "An error occurred when backing up on %(volume)s."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:52
-msgid "Downloads today:"
+#: rapid/problemnotification.py:273
+msgid "Errors occurred when backing up on the following backup devices: "
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:53
-msgid "Error Handling"
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
+#, python-format
+msgid "%(volume)s (%(inst)s), "
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:54
-msgid "Error Log"
+#: rapid/problemnotification.py:279
+#, python-format
+msgid "%(volume)s, "
+msgstr ""
+
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
+#, python-format
+msgid "%(volumes)s and %(volume)s (%(inst)s)."
+msgstr ""
+
+#: rapid/problemnotification.py:288
+#, python-format
+msgid "%(volumes)s and %(volume)s."
+msgstr ""
+
+#: rapid/problemnotification.py:296
+#, python-format
+msgid "Backup already exists on %(volume)s."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Exit program if download completes without any warnings or errors"
+#: rapid/problemnotification.py:298
+msgid "Backups already exist in these locations: "
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:56
-msgid "If you disable automatic detection, choose the exact backup location."
+#: rapid/problemnotification.py:308
+#, python-format
+msgid "Backup overwritten on %(volume)s."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:57
+#: rapid/problemnotification.py:310
+msgid "Backups overwritten on these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:321
+#, python-format
+msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
+msgstr ""
+
+#: rapid/problemnotification.py:323
 msgid ""
-"If you disable automatic detection, choose the exact location of the images "
-"and videos."
+"Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:58
+#: rapid/problemnotification.py:335
+#, python-format
 msgid ""
-"If you enable automatic detection of Portable Storage Devices, the entire "
-"device will be scanned for images. On large devices, this could take some "
-"time."
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:59
-msgid "Import your photos and videos efficiently and reliably"
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:60
-msgid "Job Codes"
+#: rapid/problemnotification.py:347
+#, python-format
+msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:61
-msgid "Location:"
+#: rapid/problemnotification.py:355
+#, python-format
+msgid " Furthermore, there were %(problems)s."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:62
-msgid "Overwrite"
-msgstr "Espotir"
+#: rapid/problemnotification.py:357
+#, python-format
+msgid " Furthermore, there was a %(problem)s."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:63
-msgid "P_review Columns"
+#: rapid/problemnotification.py:366
+#, python-format
+msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:64
-msgid "Photo Folders"
+#: rapid/problemnotification.py:368
+msgid "The following metadata is missing: "
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:65
-msgid "Photo Rename"
+#: rapid/problemnotification.py:371
+#, python-format
+msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:66
-msgid "Photo backup folder name:"
+#: rapid/problemnotification.py:388
+msgid "Problems in subfolder and filename generation"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:67
-msgid "Preferences: Rapid Photo Downloader"
+#: rapid/problemnotification.py:390
+msgid "Problem in subfolder and filename generation"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:68
-msgid "Preview _Folders"
+#: rapid/problemnotification.py:393
+#, python-format
+msgid "Problems in %s generation"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:70
-msgid "R_emove All"
+#: rapid/problemnotification.py:395
+#, python-format
+msgid "Problem in %s generation"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:72
-msgid ""
-"Rapid Photo Downloader is free software; you can redistribute it and/or "
-"modify it under the terms of the GNU General Public License as published by "
-"the Free Software Foundation; either version 2 of the License, or (at your "
-"option) any later version.\n"
-"\n"
-"Rapid Photo Downloader is distributed in the hope that it will be useful, "
-"but WITHOUT ANY WARRANTY; without even the implied warranty of "
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
-"Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"Rapid Photo Downloader; if not, write to the Free Software Foundation, Inc., "
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+#: rapid/problemnotification.py:404
+#, python-format
+msgid "%(filetype)s already exists, but it was backed up"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:77
-msgid "Rename Options"
+#: rapid/problemnotification.py:406
+#, python-format
+msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:78
-msgid "Se_lect None"
+#: rapid/problemnotification.py:428
+msgid "Multiple problems were encountered"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:79
-msgid "Select All Pho_tos"
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
+msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:80
-msgid "Select All Vi_deos"
+#: rapid/problemnotification.py:436
+msgid "there were errors backing up"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:81
-msgid "Select All Wit_h Job Code"
+#: rapid/problemnotification.py:437
+msgid "There were errors backing up"
+msgstr ""
+
+#: rapid/problemnotification.py:439
+msgid "there was an error backing up"
+msgstr ""
+
+#: rapid/problemnotification.py:440
+msgid "There was an error backing up"
+msgstr ""
+
+#. e.g.
+#: rapid/problemnotification.py:443
+#, python-format
+msgid "%(previousproblem)s, and %(backinguperror)s"
+msgstr ""
+
+#: rapid/rpdfile.py:159
+#, python-format
+msgid "%(number)s %(filetypes)s"
+msgstr ""
+
+#: rapid/rpdfile.py:169
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:82
+#: rapid/subfolderfile.py:81
+#, python-format
+msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgstr ""
+
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr ""
+
+#: rapid/subfolderfile.py:406
+msgid "Photo has already been downloaded"
+msgstr ""
+
+#: rapid/subfolderfile.py:407
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Font : %(source)s"
+
+#: rapid/subfolderfile.py:485
+msgid "Failed to create download subfolder"
+msgstr ""
+
+#: rapid/subfolderfile.py:486
+#, python-format
+msgid "Path: %s"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "_Far un don..."
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:16
+msgid "_File"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:17
+msgid "Download / Pause"
+msgstr "Transferiment / Pausa"
+
+#: rapid/glade3/rapid.ui.h:18
+msgid "_Select"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:19
 msgid "Select All Without _Job Code"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:83
-msgid "Select _All"
+#: rapid/glade3/rapid.ui.h:20
+msgid "Select All Wit_h Job Code"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:84
-msgid "Skip"
-msgstr "Ignorar"
+#: rapid/glade3/rapid.ui.h:21
+msgid "_View"
+msgstr "_Afichatge"
 
-#: rapid/glade3/rapid.glade.h:85
-msgid "Skip download"
+#: rapid/glade3/rapid.ui.h:22
+msgid "_Error Log"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:23
+msgid "_Clear Completed Downloads"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:24
+msgid "Previous File"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:25
+msgid "Next File"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:26
+msgid "_Help"
+msgstr "_Ajuda"
+
+#: rapid/glade3/rapid.ui.h:27
+msgid "_Translate this Application..."
+msgstr "_Traduire aquesta aplicacion..."
+
+#: rapid/glade3/rapid.ui.h:28
+msgid "_Include in download"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:29
+msgid "_Download"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:1
+msgid "Preferences: Rapid Photo Downloader"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:2
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/prefs.ui.h:3
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:4
+msgid "<b>Download Subfolders</b>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:5
+msgid "Download folder:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:6
+msgid ""
+"Choose the download folder. Subfolders for the downloaded photos will be "
+"automatically created in this folder using the structure specified below."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:7
+msgid "<b>Download Folder</b>"
+msgstr "<b>Dorsièr de destinacion</b>"
+
+#: rapid/glade3/prefs.ui.h:8
+msgid "Photo Folders"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:9
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:10
+msgid "<b>Photo Rename</b>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:11
+msgid " "
+msgstr " "
+
+#: rapid/glade3/prefs.ui.h:12
+msgid "<i>New:</i>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:13
+msgid "<i>Original:</i>"
+msgstr "<i>Original :</i>"
+
+#: rapid/glade3/prefs.ui.h:14
+msgid "<b>Example</b>"
+msgstr "<b>Exemple</b>"
+
+#: rapid/glade3/prefs.ui.h:15
+msgid "Photo Rename"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:16
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:17
 msgid ""
 "Sorry, video downloading functionality disabled. To download videos, please "
-"install the <i>kaa metadata</i> package for python."
+"install either the <i>hachoir metadata</i> and <i>kaa metadata</i> packages "
+"for python, or <i>exiftool</i>."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/prefs.ui.h:18
 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>"
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:19
+msgid "Video Folders"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/prefs.ui.h:20
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:21
+msgid "Video Rename"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:22
+msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:23
+msgid "<b>Sequence Numbers</b>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:24
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/prefs.ui.h:25
+msgid "Day start:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:26
+msgid "Downloads today:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:27
+msgid "Stored number:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:28
+msgid ":"
+msgstr ":"
+
+#: rapid/glade3/prefs.ui.h:29
+msgid " hh:mm"
+msgstr " hh:mm"
+
+#: rapid/glade3/prefs.ui.h:30
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:31
+msgid "<b>Compatibility with Other Operating Systems</b>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:32
 msgid ""
 "Specify whether photo, video and folder names should have any characters "
 "removed that are not allowed by other operating systems."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:92
-msgid "Start downloading at program startup"
+#: rapid/glade3/prefs.ui.h:33
+msgid "Strip incompatible characters"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:93
-msgid "Start downloading upon device insertion"
+#: rapid/glade3/prefs.ui.h:34
+msgid "Rename Options"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:94
-msgid "Stored number:"
+#: rapid/glade3/prefs.ui.h:35
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:95
-msgid "Strip incompatible characters"
+#: rapid/glade3/prefs.ui.h:36
+msgid "<b>Job Codes</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:96
-msgid "Synchronize RAW + JPEG sequence numbers"
+#: rapid/glade3/prefs.ui.h:37
+msgid "_Add..."
+msgstr "_Apondre..."
+
+#: rapid/glade3/prefs.ui.h:39
+msgid "R_emove All"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:97
-msgid "Unmount (\"eject\") device upon download completion"
+#: rapid/glade3/prefs.ui.h:40
+msgid "Job Codes"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:98
-msgid "Video Folders"
+#: rapid/glade3/prefs.ui.h:41
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:99
-msgid "Video Rename"
+#: rapid/glade3/prefs.ui.h:42
+msgid "Devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:100
-msgid "Video backup folder name:"
+#: 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"
+"\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\n"
+"\n"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:48
+msgid "Automatically detect Portable Storage Devices"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:49
+msgid "Automatically detect devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/prefs.ui.h:50
 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."
+"If you enable automatic detection of Portable Storage Devices, the entire "
+"device will be scanned. On large devices, this could take some time.\n"
+"\n"
+"When this option is enabled, and a potential device is detected, you will be "
+"prompted to determine if it should be scanned or not."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/prefs.ui.h:53
+msgid "Location:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:54
 msgid ""
-"When backing up, choose whether to overwrite a file on the backup device "
-"that has the same name, or skip backing it up."
+"If you disable automatic detection, choose the exact location of the photos "
+"and videos."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:55
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:56
+msgid "Remembered Paths"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:57
+msgid ""
+"Remembered paths are those associated with devices that you have chosen to "
+"always scan or ignore when automatic detection of Portable Storage Devices "
+"is enabled."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/prefs.ui.h:59
+msgid ""
+"Specify the ending portion of any paths you want ignored when scanning "
+"devices for photos or videos. Any path ending with the values below will not "
+"be scanned."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:61
+msgid "Re_move All"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:62
+msgid "Use _python-style regular expressions"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:63
+msgid "Device Options"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:64
+msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:65
+msgid "<b>Backup</b>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:66
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:67
+msgid "Automatically detect backup devices"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:68
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:104
-msgid "_Add..."
-msgstr "_Apondre..."
+#: rapid/glade3/prefs.ui.h:69
+msgid "Back up photos and videos when downloading"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:105
-msgid "_Clear Completed Downloads"
+#: 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 ""
 
-#: rapid/glade3/rapid.glade.h:106
-msgid "_Device"
+#: rapid/glade3/prefs.ui.h:73
+msgid "Photo backup location:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:107
-msgid "_Error Log"
+#: rapid/glade3/prefs.ui.h:74
+msgid "Photo backup folder name:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:108
-msgid "_File"
+#: rapid/glade3/prefs.ui.h:75
+msgid "<i>Example:</i>"
+msgstr "<i>Exemple :</i>"
+
+#: rapid/glade3/prefs.ui.h:76
+msgid "<i>/media/externaldrive/Photos</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:109
-msgid "_Filename"
+#: rapid/glade3/prefs.ui.h:77
+msgid "Video backup folder name:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:110
-msgid "_Get Help Online..."
+#: rapid/glade3/prefs.ui.h:78
+msgid "Video backup location:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:111
-msgid "_Help"
-msgstr "_Ajuda"
+#: rapid/glade3/prefs.ui.h:79
+msgid "Back up"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:112
-msgid "_Make a Donation..."
-msgstr "_Far un don..."
+#: rapid/glade3/prefs.ui.h:80
+msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:113
-msgid "_Path"
+#: rapid/glade3/prefs.ui.h:81
+msgid "<b>Program Automation</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:114
-msgid "_Preview"
+#: rapid/glade3/prefs.ui.h:82
+msgid "Unmount (\"eject\") device upon download completion"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:115
-msgid "_Report a Problem..."
+#: rapid/glade3/prefs.ui.h:83
+msgid "Start downloading at program startup"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:116
-msgid "_Select"
+#: rapid/glade3/prefs.ui.h:84
+msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:117
-msgid "_Size"
+#: rapid/glade3/prefs.ui.h:85
+msgid "Exit program when download completes"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:118
-msgid "_Translate this Application..."
-msgstr "_Traduire aquesta aplicacion..."
+#: rapid/glade3/prefs.ui.h:86
+msgid "Exit program even if download had warnings or errors"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:119
-msgid "_Type"
+#: rapid/glade3/prefs.ui.h:87
+msgid "Automatically rotate JPEG images"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:120
-msgid "_View"
-msgstr "_Afichatge"
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:90
+msgid "Performance"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:91
+msgid "Generate thumbnails (slower)"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:92
+msgid "Miscellaneous"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:93
+msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Gestion de las errors</span>"
+
+#: rapid/glade3/prefs.ui.h:94
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:95
+msgid "Add unique identifier"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:96
+msgid "Skip download"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:97
+msgid ""
+"When a photo or video of the same name has already been downloaded, choose "
+"whether to skip downloading the file, or to add a unique indentifier."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:98
+msgid ""
+"When backing up, choose whether to overwrite a file on the backup device "
+"that has the same name, or skip backing it up."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:99
+msgid "Overwrite"
+msgstr "Espotir"
+
+#: rapid/glade3/prefs.ui.h:100
+msgid "Skip"
+msgstr "Ignorar"
+
+#: rapid/glade3/prefs.ui.h:101
+msgid "Error Handling"
+msgstr ""
+
+#: rapid/glade3/about.ui.h:1
+msgid "Import your photos and videos efficiently and reliably"
+msgstr ""
+
+#~ msgid "Could not open image"
+#~ msgstr "Impossible de dobrir l'imatge"
+
+#, python-format
+#~ msgid "Source: %s"
+#~ msgstr "Font : %s"
+
+#~ msgid "errors"
+#~ msgstr "errors"
+
+#~ msgid "Thumbnail cannot be displayed"
+#~ msgstr "Impossible d'afichar la vinheta"
+
+#, python-format
+#~ msgid "0 of %s images copied"
+#~ msgstr "0 de %s imatges copiats"
+
+#~ msgid "Select an image folder"
+#~ msgstr "Seleccionar un dorsièr d'imatges"
+
+#, python-format
+#~ msgid ""
+#~ "Source: %(source)s\n"
+#~ "Problem: %(problem)s"
+#~ msgstr ""
+#~ "Font : %(source)s\n"
+#~ "Problèma : %(problem)s"
+
+#, python-format
+#~ msgid "%s images downloaded"
+#~ msgstr "%s imatges transferits"
+
+#~ msgid "Image overwritten"
+#~ msgstr "Imatge espotit"
+
+#~ msgid "Image skipped"
+#~ msgstr "Imatge passat"
+
+#, python-format
+#~ msgid "Unique identifier '%s' added"
+#~ msgstr "Identifcant unic '%s' apondut"
+
+#, python-format
+#~ msgid ""
+#~ "Source: %(source)s\n"
+#~ "Destination: %(destination)s\n"
+#~ "Error: %(errno)s %(strerror)s"
+#~ msgstr ""
+#~ "Font : %(source)s\n"
+#~ "Destinacion : %(destination)s\n"
+#~ "Error : %(errno)s %(strerror)s"
+
+#~ msgid "Image has no thumbnail"
+#~ msgstr "L'imatge a pas d'apercebut"
+
+#, python-format
+#~ msgid "%(number)s of %(total)s images copied"
+#~ msgstr "%(number)s imatges copiats sus %(total)s"
+
+#~ msgid "Warning:"
+#~ msgstr "Avertiment :"
+
+#~ msgid "Problem using pynotify."
+#~ msgstr "Problèma d'utilizacion de pynotify"
+
+#~ msgid "_Download "
+#~ msgstr "_Transferiment "
+
+#~ msgid "_Pause"
+#~ msgstr "_Pausa"
+
+#~ msgid "Goodbye"
+#~ msgstr "Al reveire"
+
+#~ msgid "<b>Image Name Conflicts</b>"
+#~ msgstr "<b>Conflictes de nom d'imatges</b>"
+
+#~ msgid "<b>Image Devices</b>"
+#~ msgstr "<b>Volum d'imatges</b>"
+
+#~ msgid "Automation"
+#~ msgstr "Automatizacion"
+
+#~ msgid "Backup"
+#~ msgstr "Salvament"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Volum d'imatges</span>"
+
+#~ msgid "Download Folder"
+#~ msgstr "Transferiment"
+
+#~ msgid "Ignore"
+#~ msgstr "Ignorar"
+
+#~ msgid "Image Devices"
+#~ msgstr "Voums d'imatges"
+
+#~ msgid "_Thumbnails"
+#~ msgstr "_Vinhetas"
+
+#~ msgid "Using"
+#~ msgstr "En utilizacion"
+
+#~ msgid "      "
+#~ msgstr "      "
+
+#~ msgid "_Photos"
+#~ msgstr "_Fòtos"
diff --git a/po/pl.po b/po/pl.po
index 1ef2f49..3a20c07 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-06-23 04:00-0500\n"
-"PO-Revision-Date: 2012-06-23 09:30+0000\n"
-"Last-Translator: mmiicc <mpredotka@gmail.com>\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:17+0000\n"
+"Last-Translator: Michal Predotka <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-06-25 00:48+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:119
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:122
+#: rapid/rapid.py:127
 #, 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:157
+#: rapid/rapid.py:162
 msgid "Device"
 msgstr "Urządzenie"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:175
+#: rapid/rapid.py:180
 msgid "Size"
 msgstr "Rozmiar"
 
-#: rapid/rapid.py:178
+#: rapid/rapid.py:183
 msgid "Download Progress"
 msgstr "Postęp pobierania"
 
-#: rapid/rapid.py:336
+#: rapid/rapid.py:343
 #, 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:1216
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr "wyszukiwanie..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1782
+#: rapid/rapid.py:1818
 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:1786
+#: rapid/rapid.py:1822
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Pobieranie z %(location)s."
 
-#: rapid/rapid.py:1787
+#: rapid/rapid.py:1823
 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:2209
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr "Pobierz"
 
-#: rapid/rapid.py:2212
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#: rapid/rapid.py:2317
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -108,7 +108,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2320
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -117,177 +117,190 @@ msgstr ""
 "Nieprawidłowy katalog pobierania:\n"
 "%s"
 
-#: rapid/rapid.py:2321
+#: rapid/rapid.py:2380
 msgid "Download cannot proceed"
 msgstr "Pobieranie nie może się odbyć"
 
-#: rapid/rapid.py:2700
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+"Żadne urządzenie do zapisu kopii zapasowej nie zawiera katalogu do "
+"utworzenia kopii %(filetype)s"
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "zdjęcia"
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "filmy"
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr "Problem z zapisem kopii zapasowej"
+
+#: rapid/rapid.py:2802
 msgid "About 1 second remaining"
 msgstr "Pozostała około sekunda"
 
-#: rapid/rapid.py:2702
+#: rapid/rapid.py:2804
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Pozostało około %i sekund"
 
-#: rapid/rapid.py:2704
+#: rapid/rapid.py:2806
 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:2709
+#: rapid/rapid.py:2811
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Pozostało około %(minutes)i:%(seconds)02i minut"
 
-#: rapid/rapid.py:2731 rapid/rpdfile.py:123
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
 msgid "photos and videos"
 msgstr "zdjęcia i filmy"
 
-#: rapid/rapid.py:2733 rapid/rpdfile.py:125
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
 msgid "photos or videos"
 msgstr "zdjęcia lub filmy"
 
-#: rapid/rapid.py:2736 rapid/rapid.py:3558 rapid/rpdfile.py:128
-msgid "videos"
-msgstr "filmy"
-
-#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
-#: rapid/rpdfile.py:291
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
 msgid "video"
 msgstr "film"
 
-#: 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:2743 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
-#: rapid/rpdfile.py:272
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
 msgid "photo"
 msgstr "zdjęcie"
 
-#: rapid/rapid.py:2770
+#: rapid/rapid.py:2872
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "Pobrane pliki typu %(filetypes)s: %(noFiles)s"
 
-#: rapid/rapid.py:2774
+#: rapid/rapid.py:2876
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "Nieudanych pobrań plików typu %(filetypes)s: %(noFiles)s"
 
-#: rapid/rapid.py:2777 rapid/rapid.py:2829
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
 msgid "warnings"
 msgstr "ostrzeżenia"
 
-#: rapid/rapid.py:2786
+#: rapid/rapid.py:2892
 msgid "All downloads complete"
 msgstr "Ukończono wszystkie pobierania"
 
-#: rapid/rapid.py:2792 rapid/rapid.py:2801 rapid/rapid.py:2810
-#: rapid/rapid.py:2819 rapid/rapid.py:2827
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2794 rapid/rapid.py:2812
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "Plik typu %(filetype)s został pobrany"
 
-#: rapid/rapid.py:2803 rapid/rapid.py:2821
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, 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:2860
+#: rapid/rapid.py:2970
 #, 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:2867
+#: rapid/rapid.py:2977
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s z %(total)s plików typu %(filetypes)s"
 
-#: rapid/rapid.py:3222
+#: rapid/rapid.py:3331
 msgid "From"
 msgstr "Źródło"
 
-#: rapid/rapid.py:3230
+#: rapid/rapid.py:3339
 msgid "Auto Detect"
 msgstr "Wykrywanie automatyczne"
 
-#: rapid/rapid.py:3234 rapid/preferencesdialog.py:1327
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Wybór katalogu zawierającego %(file_types)s"
 
-#: rapid/rapid.py:3275
+#: rapid/rapid.py:3384
 msgid "Copy"
 msgstr "Skopiuj"
 
-#: rapid/rapid.py:3288
+#: rapid/rapid.py:3397
 msgid "Move"
 msgstr "Przenieś"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3419
 msgid "To"
 msgstr "Cel"
 
-#: rapid/rapid.py:3317 rapid/rapid.py:3986
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
 msgid "Photos:"
 msgstr "Zdjęcia:"
 
-#: rapid/rapid.py:3320 rapid/preferencesdialog.py:1164
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
 msgid "Select a folder to download photos to"
 msgstr "Wybór katalogu dla pobieranych zdjęć"
 
-#: rapid/rapid.py:3332 rapid/rapid.py:3986
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
 msgid "Videos:"
 msgstr "Filmy:"
 
-#: rapid/rapid.py:3334 rapid/preferencesdialog.py:1182
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
 msgid "Select a folder to download videos to"
 msgstr "Wybór katalogu dla pobieranych filmów"
 
-#: rapid/rapid.py:3526
+#: rapid/rapid.py:3650
 msgid "and"
 msgstr "oraz"
 
-#: rapid/rapid.py:3531
+#: rapid/rapid.py:3655
 msgid "Using backup devices"
 msgstr "Użycie urządzeń do zapisu kopii zapasowej"
 
-#: rapid/rapid.py:3533
+#: rapid/rapid.py:3657
 msgid "Using backup device"
 msgstr "Użycie urządzenia do zapisu kopii zapasowej"
 
-#: rapid/rapid.py:3535
+#: rapid/rapid.py:3659
 msgid "No backup devices detected"
 msgstr "Nie wykryto urządzeń na których można utworzyć kopię zapasową"
 
-#: rapid/rapid.py:3562
+#: rapid/rapid.py:3686
 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:3574
+#: rapid/rapid.py:3698
 #, 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:3578
+#: rapid/rapid.py:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -295,87 +308,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:3583
+#: rapid/rapid.py:3707
 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:3588
+#: rapid/rapid.py:3712
 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:3594
+#: rapid/rapid.py:3718
 #, 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:3602
+#: rapid/rapid.py:3726
 #, 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:3605
+#: rapid/rapid.py:3729
 #, 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:3608
+#: rapid/rapid.py:3732
 #, 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:3615
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3644
+#: rapid/rapid.py:3768
 msgid "Program preferences are invalid"
 msgstr "Preferencje programu są nieprawidłowe"
 
-#: rapid/rapid.py:3770 rapid/rpdfile.py:273
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
 msgid "Photo"
 msgstr "Zdjęcie"
 
-#: rapid/rapid.py:3772 rapid/rpdfile.py:292
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "Film"
 
-#: rapid/rapid.py:3781
+#: rapid/rapid.py:3921
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "katalog pobierania %(file_type)s nie istnieje"
 
-#: rapid/rapid.py:3783 rapid/rapid.py:3797 rapid/rapid.py:3810
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
 msgid "Folder: %s"
 msgstr "Katalog: %s"
 
-#: rapid/rapid.py:3795
+#: rapid/rapid.py:3935
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "katalog pobierania %(file_type)s jest nieprawidłowy"
 
-#: rapid/rapid.py:3808
+#: rapid/rapid.py:3948
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "katalog pobierania %(file_type)s nie jest zapisywalny"
 
-#: rapid/rapid.py:3894
+#: rapid/rapid.py:4034
 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:3949
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -384,21 +397,21 @@ msgstr ""
 "wyświetl informacje programu w linii komend podczas działania programu "
 "(domyślnie: %default)"
 
-#: rapid/rapid.py:3950
+#: rapid/rapid.py:4090
 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:3951
+#: rapid/rapid.py:4091
 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:3953
+#: rapid/rapid.py:4093
 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:3955
+#: rapid/rapid.py:4095
 msgid ""
 "automatically detect devices from which to download, overwriting existing "
 "program preferences"
@@ -406,7 +419,7 @@ msgstr ""
 "automatyczne wykrywaj urządzenia z których ma nastąpić pobieranie, "
 "nadpisując istniejące ustawienia programu"
 
-#: rapid/rapid.py:3956
+#: rapid/rapid.py:4096
 msgid ""
 "manually specify the PATH of the device from which to download, overwriting "
 "existing program preferences"
@@ -414,11 +427,11 @@ 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
+#: rapid/rapid.py:4097
 msgid "reset all program settings and preferences and exit"
 msgstr "zresetuj wszystkie ustawienia oraz preferencje programu i zakończ"
 
-#: rapid/rapid.py:3970
+#: rapid/rapid.py:4110
 msgid ""
 "Error: specify device auto-detection or manually specify a device's path "
 "from which to download, but do not do both."
@@ -427,25 +440,26 @@ msgstr ""
 "urządzenia z którego ma nastąpić pobieranie, ale nie obydwie rzeczy "
 "jednocześnie."
 
-#: rapid/rapid.py:3991
+#: rapid/rapid.py:4133
 #, python-format
 msgid "and %s"
 msgstr "oraz %s"
 
-#: rapid/rapid.py:3999
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
 msgstr "Wszystkie ustawienia oraz preferencje zostały zresetowane"
 
-#: rapid/backupfile.py:157 rapid/backupfile.py:180
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
 msgid "Backing up error"
 msgstr "Błąd tworzenia kopii zapasowej"
 
-#: rapid/backupfile.py:159
+#: rapid/backupfile.py:151
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Katalog docelowy nie mógł zostać utworzony:  %(directory)s\n"
 
-#: rapid/backupfile.py:161 rapid/backupfile.py:182 rapid/subfolderfile.py:199
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -454,13 +468,29 @@ msgstr ""
 "Źródło: %(source)s\n"
 "Cel: %(destination)s"
 
-#: rapid/backupfile.py:164 rapid/backupfile.py:184
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Błąd: %(inst)s"
 
-#: rapid/copyfiles.py:163 rapid/subfolderfile.py:214
-#: rapid/subfolderfile.py:347 rapid/subfolderfile.py:365
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr "Nadpisano kopię zapasową %(file_type)s"
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr "%(file_type)s nie ma kopii zapasowej"
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr "Kopia zapasowa %(file_type)s już istnieje"
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -469,6 +499,10 @@ msgstr ""
 "%(problem)s\n"
 "Plik: %(file)s"
 
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr "Wystąpił nieznany błąd"
+
 #: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Znalezione urządzenie"
@@ -953,20 +987,20 @@ msgstr ""
 msgid "Path:"
 msgstr "Scieżka:"
 
-#: rapid/preferencesdialog.py:1082
+#: rapid/preferencesdialog.py:1092
 msgid "Job Code"
 msgstr "Kod pracy"
 
-#: rapid/preferencesdialog.py:1353
+#: rapid/preferencesdialog.py:1363
 msgid "Select a folder in which to backup photos"
 msgstr "Proszę wybrać katalog dla tworzenia kopii zapasowej zdjęć"
 
-#: rapid/preferencesdialog.py:1366
+#: rapid/preferencesdialog.py:1376
 msgid "Select a folder in which to backup videos"
 msgstr "Proszę wybrać katalog dla tworzenia kopii zapasowej filmów"
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/preferencesdialog.py:1461
+#: rapid/preferencesdialog.py:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -974,7 +1008,7 @@ msgstr ""
 "<i><b>Ostrzeżenie:</b> Metadane są niewystarczające do pełnego wygenerowania "
 "nazwy. Proszę użyć innej opcji zmiany nazwy.</i>"
 
-#: rapid/preferencesdialog.py:1512
+#: rapid/preferencesdialog.py:1524
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -983,13 +1017,13 @@ msgstr ""
 "podkatalogów. Proszę użyć innej opcji określenia nazw podkatalogów.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/preferencesdialog.py:1515
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Przykład: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1605
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -1000,7 +1034,7 @@ msgstr ""
 "zostać użyte.\n"
 "Zostaną przywrócone ich domyślne wartości."
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1762
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -1011,7 +1045,7 @@ msgstr ""
 "nie będą poprawione:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1752
+#: rapid/preferencesdialog.py:1764
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -1022,17 +1056,17 @@ msgstr ""
 "poprawione:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1753
+#: rapid/preferencesdialog.py:1765
 msgid "Invalid regular expression"
 msgstr "Nieprawidłowe wyrażenie regularne"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1934
+#: rapid/preferencesdialog.py:1949
 msgid "externaldrive1"
 msgstr "dyskzewnętrzny1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1936
+#: rapid/preferencesdialog.py:1951
 msgid "externaldrive2"
 msgstr "dyskzewnętrzny2"
 
@@ -1109,55 +1143,60 @@ msgid "Stockholm"
 msgstr "Sztokholm"
 
 #. components
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:358
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
 msgstr "podkatalog"
 
-#: rapid/problemnotification.py:28 rapid/subfolderfile.py:356
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr "nazwa pliku"
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr "Wartość daty %s wydaje się nieprawidłowa."
 
-#: rapid/problemnotification.py:82
+#: rapid/problemnotification.py:86
 msgid "Filename does not have an extension."
 msgstr "Nazwa pliku nie posiada rozszerzenia."
 
 #. a number component is something like the 8346 in IMG_8346.JPG
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:88
 msgid "Filename does not have a number component."
 msgstr "Plik nie posiada cyfr w swojej nazwie."
 
-#: rapid/problemnotification.py:85
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr "Błąd w generowaniu składowej %s."
 
 #. a generic problem
-#: rapid/problemnotification.py:87
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr "metadane pliku %(filetype)s nie mogą zostać odczytane"
 
-#: rapid/problemnotification.py:89
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "Nie można wygenerować %(filetype)s %(area)s"
 
-#: rapid/problemnotification.py:91 rapid/problemnotification.py:92
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr "Wystąpił błąd przy kopiowaniu %(filetype)s"
 
-#: rapid/problemnotification.py:94 rapid/problemnotification.py:95
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr "Niepoprawne pobranie %(filetype)s"
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "%(filetype)s już istnieje"
 
-#: rapid/problemnotification.py:98
+#: rapid/problemnotification.py:105
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1166,7 +1205,7 @@ msgstr ""
 "Nie można utworzyć kopii zapasowej pliku %(filetype)s ponieważ nie udało się "
 "znaleźć właściwego miejsca na kopię."
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:110
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -1175,12 +1214,12 @@ msgstr ""
 "%(image1)s zostało zrobione %(image1_date)s o %(image1_time)s, a %(image2)s  "
 "%(image2_date)s o %(image2_time)s."
 
-#: rapid/problemnotification.py:104
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "Plik %(filetype)s już został pobrany"
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:115
 #, python-format
 msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
@@ -1189,55 +1228,61 @@ msgstr ""
 "Istniejący plik %(filetype)s został ostatnio zmodyfikowany %(date)s o "
 "%(time)s. Dodano unikalny identyfikator '%(identifier)s'."
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:116
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 "Istniejący plik %(filetype)s został ostatnio zmodyfikowany %(date)s o "
 "%(time)s."
 
-#: rapid/problemnotification.py:110
+#: rapid/problemnotification.py:117
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr "Brak danych aby nazwać %(filetype)s."
 
-#: rapid/problemnotification.py:112
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Błąd: %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:202
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr "Nieudana weryfikacja plików. Pobrana wersja różni się od oryginału."
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr "Metadane mogą być uszkodzone."
 
-#: rapid/problemnotification.py:205
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
 msgstr "Nazwa pliku, rozszerzenie i informacje Exif zostały już pobrane."
 
-#: rapid/problemnotification.py:224
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " Kopia zapasowa została utworzona na %(volume)s"
 
-#: rapid/problemnotification.py:226
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr " Kopia zapasowa została utworzona na nośnikach: "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:229 rapid/problemnotification.py:290
-#: rapid/problemnotification.py:302
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s oraz %(final_volume)s."
 
-#: rapid/problemnotification.py:241
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
@@ -1245,266 +1290,319 @@ msgid ""
 msgstr ""
 "Zdjęcia o tej samej nazwie pliku, ale zrobione w innym czasie: %(details)s"
 
-#: rapid/problemnotification.py:258
+#: rapid/problemnotification.py:269
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr ""
 "Wystąpił błąd podczas tworzenia kopii zapasowej na %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:260
+#: rapid/problemnotification.py:271
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr "Wystąpił błąd podczas tworzenia kopii zapasowej na %(volume)s."
 
-#: rapid/problemnotification.py:262
+#: rapid/problemnotification.py:273
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr ""
 "Wystąpiły błędy podczas tworzenia kopii zapasowej na następujących "
 "nośnikach: "
 
-#: rapid/problemnotification.py:266 rapid/problemnotification.py:314
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:268
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:272 rapid/problemnotification.py:316
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr "%(volumes)s oraz %(volume)s (%(inst)s)."
 
-#: rapid/problemnotification.py:277
+#: rapid/problemnotification.py:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s oraz %(volume)s."
 
-#: rapid/problemnotification.py:285
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "Kopia zapasowa już istnieje na %(volume)s."
 
-#: rapid/problemnotification.py:287
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr "Kopia zapasowa już istnieje w następujących miejscach: "
 
-#: rapid/problemnotification.py:297
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "Kopia zapasowa nadpisana na %(volume)s."
 
-#: rapid/problemnotification.py:299
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr "Kopia zapasowa nadpisana na nośnikach: "
 
-#: rapid/problemnotification.py:310
+#: rapid/problemnotification.py:321
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr "Wystąpił błąd podczas tworzenia katalogów na %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:312
+#: rapid/problemnotification.py:323
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 "Wystąpił błąd podczas tworzenia katalogów na następujących nośnikach: "
 
-#: rapid/problemnotification.py:323
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+"Nieudana weryfikacja plików na %(volume)s. Kopia zapasowa różni się od "
+"wersji pobranej."
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr "Nieudana weryfikacja plików na tych urządzeniach: "
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "%(previousproblem)s Dodatkowo, %(newproblem)s"
 
-#: rapid/problemnotification.py:331
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " Oprócz tego wystąpiły %(problems)s."
 
-#: rapid/problemnotification.py:333
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " Oprócz tego wystąpił %(problem)s."
 
-#: rapid/problemnotification.py:342
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Brak metadanych %(type)s."
 
-#: rapid/problemnotification.py:344
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr "Brak następujących metadanych: "
 
-#: rapid/problemnotification.py:347
+#: rapid/problemnotification.py:371
 #, python-format
 msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr ""
 "%(missing_metadata_elements)s oraz %(final_missing_metadata_element)s."
 
-#: rapid/problemnotification.py:364
+#: rapid/problemnotification.py:388
 msgid "Problems in subfolder and filename generation"
 msgstr "Problemy przy tworzeniu podkatalogów i nazw plików"
 
-#: rapid/problemnotification.py:366
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr "Problem w tworzeniu podkatalogu i nazwy pliku"
 
-#: rapid/problemnotification.py:369
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Problemy w tworzeniu %s"
 
-#: rapid/problemnotification.py:371
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Problem w tworzeniu %s"
 
-#: rapid/problemnotification.py:380
+#: rapid/problemnotification.py:404
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr "%(filetype)s już istnieje, ale została utworzona kopia zapasowa"
 
-#: rapid/problemnotification.py:382
+#: rapid/problemnotification.py:406
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 "Wystąpił błąd podczas kopiowania %(filetype)s, ale została utworzona kopia "
 "zapasowa"
 
-#: rapid/problemnotification.py:402
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr "Wystąpiło kilka problemów"
 
-#: rapid/problemnotification.py:404 rapid/subfolderfile.py:233
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr "Zdjęcia z taką samą nazwą, ale zrobione w różnym czasie"
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr "wystąpiły błędy podczas tworzenia kopii zapasowej"
 
-#: rapid/problemnotification.py:411
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr "Wystąpiły błędy podczas tworzenia kopii zapasowej"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr "wystąpił błąd podczas tworzenia kopii zapasowej"
 
-#: rapid/problemnotification.py:414
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr "Wystąpił błąd podczas tworzenia kopii zapasowej"
 
 #. e.g.
-#: rapid/problemnotification.py:417
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, oraz %(backinguperror)s"
 
-#: rapid/rpdfile.py:153
+#: rapid/rpdfile.py:159
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/rpdfile.py:163
+#: rapid/rpdfile.py:169
 #, 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
+#: rapid/subfolderfile.py:81
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr "podkatalog i nazwa pliku"
+
+#: rapid/subfolderfile.py:406
 msgid "Photo has already been downloaded"
 msgstr "Zdjęcie zostało już pobrane"
 
-#: rapid/subfolderfile.py:302
+#: rapid/subfolderfile.py:407
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Źródło: %(source)s"
 
-#: rapid/subfolderfile.py:354
-msgid "subfolder and filename"
-msgstr "podkatalog i nazwa pliku"
-
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:485
 msgid "Failed to create download subfolder"
 msgstr "Nie udało się utworzyć podkatalogu pobierania"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:486
 #, python-format
 msgid "Path: %s"
 msgstr "Ścieżka: %s"
 
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr "O programie..."
+
 #: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
+msgstr "Zaznacz _wszystko"
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr "Zaznacz wszystkie zdjęcia"
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr "Zaznacz wszystkie filmy"
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "_Darowizna"
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr "Z_najdź pomoc w sieci..."
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr "Pomoc"
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
+msgstr "Preferencje"
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
+msgstr "Zakończ"
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
+msgstr "Odśwież"
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr "Zgłoś _błąd w programie..."
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
+msgstr "Przetłumacz ten program..."
+
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr "_Odznacz wszystko"
+
+#: rapid/glade3/rapid.ui.h:16
 msgid "_File"
 msgstr "_Plik"
 
-#: rapid/glade3/rapid.ui.h:3
+#: rapid/glade3/rapid.ui.h:17
 msgid "Download / Pause"
 msgstr "Pobierz / Wstrzymaj"
 
-#: rapid/glade3/rapid.ui.h:4
+#: rapid/glade3/rapid.ui.h:18
 msgid "_Select"
 msgstr "_Zaznaczenie"
 
-#: rapid/glade3/rapid.ui.h:5
+#: rapid/glade3/rapid.ui.h:19
 msgid "Select All Without _Job Code"
 msgstr "Zaznacz wszystkie _bez kodu pracy"
 
-#: rapid/glade3/rapid.ui.h:6
+#: rapid/glade3/rapid.ui.h:20
 msgid "Select All Wit_h Job Code"
 msgstr "Zaznacz wszystkie z _kodem pracy"
 
-#: rapid/glade3/rapid.ui.h:7
+#: rapid/glade3/rapid.ui.h:21
 msgid "_View"
 msgstr "_Widok"
 
-#: rapid/glade3/rapid.ui.h:8
+#: rapid/glade3/rapid.ui.h:22
 msgid "_Error Log"
 msgstr "_Dziennik błędów"
 
-#: rapid/glade3/rapid.ui.h:9
+#: rapid/glade3/rapid.ui.h:23
 msgid "_Clear Completed Downloads"
 msgstr "Wyczyść _ukończone pobierania"
 
-#: rapid/glade3/rapid.ui.h:10
+#: rapid/glade3/rapid.ui.h:24
 msgid "Previous File"
 msgstr "Poprzedni plik"
 
-#: rapid/glade3/rapid.ui.h:11
+#: rapid/glade3/rapid.ui.h:25
 msgid "Next File"
 msgstr "Następny plik"
 
-#: rapid/glade3/rapid.ui.h:12
+#: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: rapid/glade3/rapid.ui.h:13
-msgid "_Make a Donation..."
-msgstr "_Darowizna"
-
-#: rapid/glade3/rapid.ui.h:14
+#: rapid/glade3/rapid.ui.h:27
 msgid "_Translate this Application..."
 msgstr "_Przetłumacz ten program..."
 
-#: rapid/glade3/rapid.ui.h:15
-msgid "_Check All"
-msgstr "Zaznacz _wszystko"
-
-#: rapid/glade3/rapid.ui.h:16
-msgid "_Uncheck All"
-msgstr "_Odznacz wszystko"
-
-#: rapid/glade3/rapid.ui.h:17
+#: rapid/glade3/rapid.ui.h:28
 msgid "_Include in download"
 msgstr "Zaw_rzyj w pobieraniu"
 
-#: rapid/glade3/rapid.ui.h:18
+#: rapid/glade3/rapid.ui.h:29
 msgid "_Download"
 msgstr "Pobie_rz"
 
@@ -1828,7 +1926,7 @@ msgstr ""
 "filmów, np. na zewnętrznych dyskach twardych."
 
 #: rapid/glade3/prefs.ui.h:69
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr "Utwórz kopię zapasową zdjęć i filmów podczas pobierania"
 
 #: rapid/glade3/prefs.ui.h:70
@@ -1872,8 +1970,8 @@ msgid "Video backup location:"
 msgstr "Położenie kopii zapasowej filmów:"
 
 #: rapid/glade3/prefs.ui.h:79
-msgid "Backup"
-msgstr "Kopia zapasowa"
+msgid "Back up"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:80
 msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
@@ -1908,35 +2006,39 @@ msgstr ""
 msgid "Automatically rotate JPEG images"
 msgstr "Automatycznie obracaj obrazy JPEG"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr "Weryfikuj pliki podczas pobierania"
+
+#: rapid/glade3/prefs.ui.h:90
 msgid "Performance"
 msgstr "Wydajność"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:91
 msgid "Generate thumbnails (slower)"
 msgstr "Utwórz miniatury (wolniej)"
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:92
 msgid "Miscellaneous"
 msgstr "Różności"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Obsługa błędów</span>"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Konflikty między nazwami zdjęć i filmów</b>"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Add unique identifier"
 msgstr "Dodaj unikatowy identyfikator"
 
-#: rapid/glade3/prefs.ui.h:94
+#: rapid/glade3/prefs.ui.h:96
 msgid "Skip download"
 msgstr "Pomiń pobieranie"
 
-#: rapid/glade3/prefs.ui.h:95
+#: rapid/glade3/prefs.ui.h:97
 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."
@@ -1944,7 +2046,7 @@ msgstr ""
 "Proszę określić działanie w przypadku, gdy zdjęcie lub film o tej samej "
 "nazwie został już pobrany."
 
-#: rapid/glade3/prefs.ui.h:96
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1952,15 +2054,15 @@ msgstr ""
 "Proszę wybrać, czy podczas tworzenia kopii zapasowej nadpisać czy pominąć "
 "plik o tej samej nazwie na urządzeniu docelowym."
 
-#: rapid/glade3/prefs.ui.h:97
+#: rapid/glade3/prefs.ui.h:99
 msgid "Overwrite"
 msgstr "Nadpisz"
 
-#: rapid/glade3/prefs.ui.h:98
+#: rapid/glade3/prefs.ui.h:100
 msgid "Skip"
 msgstr "Pomiń"
 
-#: rapid/glade3/prefs.ui.h:99
+#: rapid/glade3/prefs.ui.h:101
 msgid "Error Handling"
 msgstr "Obsługa błędów"
 
@@ -1989,6 +2091,9 @@ msgstr "Importuj zdjęcia i wideo wydajnie i niezawodnie"
 #~ msgid "      "
 #~ msgstr "      "
 
+#~ msgid "Backup"
+#~ msgstr "Kopia zapasowa"
+
 #~ msgid "Backup folder name:"
 #~ msgstr "Nazwa katalogu z kopią zapasową:"
 
@@ -2041,12 +2146,6 @@ msgstr "Importuj zdjęcia i wideo wydajnie i niezawodnie"
 #~ msgid "Backup location:"
 #~ msgstr "Położenie kopii zapasowej:"
 
-#~ msgid "_Get Help Online..."
-#~ msgstr "Z_najdź pomoc w sieci..."
-
-#~ msgid "_Report a Problem..."
-#~ msgstr "Zgłoś _błąd w programie..."
-
 #~ msgid "_Thumbnails"
 #~ msgstr "_Miniatury"
 
diff --git a/po/pt.po b/po/pt.po
index ed356c6..8cf17c6 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,1919 +7,2066 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-10-22 21:26-0500\n"
-"PO-Revision-Date: 2010-09-23 05:04+0000\n"
-"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-02-21 13:30+0000\n"
+"Last-Translator: Tiago S. <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-25 03:12+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2014-02-23 16:36+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:124 rapid/rapid.py:6353 rapid/glade3/rapid.glade.h:71
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
-msgstr "Baixador Rápido de Foto"
+msgstr "Transferidor Rápido de Foto"
 
-#: rapid/rapid.py:456
-msgid "New York"
-msgstr "Nova Iorque"
-
-#: rapid/rapid.py:457
-msgid "Manila"
-msgstr "Manila"
-
-#: rapid/rapid.py:457
-msgid "Prague"
-msgstr "Praga"
-
-#: rapid/rapid.py:457
-msgid "Helsinki"
-msgstr "Helsinki"
-
-#: rapid/rapid.py:457
-msgid "Wellington"
-msgstr "Wellington"
-
-#: rapid/rapid.py:458
-msgid "Tehran"
-msgstr "Teerã"
-
-#: rapid/rapid.py:458
-msgid "Kampala"
-msgstr "Kampala"
-
-#: rapid/rapid.py:458
-msgid "Paris"
-msgstr "Paris"
-
-#: rapid/rapid.py:458
-msgid "Berlin"
-msgstr "Berlim"
-
-#: rapid/rapid.py:458
-msgid "Sydney"
-msgstr ""
-
-#: rapid/rapid.py:459
-msgid "Budapest"
-msgstr ""
-
-#: rapid/rapid.py:459
-msgid "Rome"
-msgstr ""
-
-#: rapid/rapid.py:459
-msgid "Moscow"
-msgstr ""
-
-#: rapid/rapid.py:459
-msgid "Delhi"
-msgstr ""
-
-#: rapid/rapid.py:459
-msgid "Warsaw"
-msgstr ""
-
-#: rapid/rapid.py:460
-msgid "Jakarta"
-msgstr ""
-
-#: rapid/rapid.py:460
-msgid "Madrid"
-msgstr ""
-
-#: rapid/rapid.py:460
-msgid "Stockholm"
-msgstr ""
-
-#: rapid/rapid.py:493
-msgid "Invalid Downloads Today value.\n"
-msgstr ""
-
-#: rapid/rapid.py:494
-msgid "Resetting value to zero.\n"
-msgstr ""
-
-#: rapid/rapid.py:533
-msgid "'Start of day' preference value is corrupted.\n"
-msgstr ""
-
-#: rapid/rapid.py:534
-msgid "Resetting to midnight.\n"
-msgstr ""
-
-#: rapid/rapid.py:560
-msgid "Error in Photo Rename preferences"
-msgstr ""
-
-#: rapid/rapid.py:592 rapid/rapid.py:1714
-msgid "Sorry,these preferences contain an error:\n"
-msgstr ""
-
-#: rapid/rapid.py:603
-msgid "Resetting to default values."
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:678 rapid/renamesubfolderprefs.py:199
-msgid "Job code"
-msgstr ""
-
-#: rapid/rapid.py:746
-msgid "Error in Video Rename preferences"
-msgstr ""
-
-#: rapid/rapid.py:764
-msgid "Error in Photo Download Subfolders preferences"
-msgstr ""
-
-#: rapid/rapid.py:781
-msgid "Error in Video Download Subfolders preferences"
-msgstr ""
-
-#: rapid/rapid.py:814 rapid/rapid.py:1545
-msgid "photos and videos"
-msgstr ""
-
-#: rapid/rapid.py:816 rapid/rapid.py:1555 rapid/rapid.py:1683
-msgid "photos"
-msgstr ""
-
-#: rapid/rapid.py:949
-msgid "Select a folder to download photos to"
-msgstr ""
-
-#: rapid/rapid.py:967
-msgid "Select a folder to download videos to"
-msgstr ""
-
-#: rapid/rapid.py:1049
-#, python-format
-msgid "Select a folder containing %(file_types)s"
-msgstr ""
-
-#: rapid/rapid.py:1071
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
-msgstr ""
-
-#. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:1152
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
-"name. Please use other renaming options.</i>"
-msgstr ""
-
-#: rapid/rapid.py:1188
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate "
-"subfolders. Please use other subfolder naming options.</i>"
-msgstr ""
-
-#. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:1192
-#, python-format
-msgid "<i>Example: %s</i>"
-msgstr ""
-
-#: rapid/rapid.py:1218
-msgid ""
-"Downloads today value not updated, as a download is currently occurring"
-msgstr ""
-
-#: rapid/rapid.py:1234
-msgid "Stored number value not updated, as a download is currently occurring"
-msgstr ""
-
-#: rapid/rapid.py:1264
-#, python-format
-msgid ""
-"The %(filetype)s subfolder preferences had some unnecessary values removed."
-msgstr ""
-
-#. Preferences list is now empty
-#: rapid/rapid.py:1269
-#, python-format
-msgid ""
-"The %(filetype)s subfolder preferences entered are invalid and cannot be "
-"used.\n"
-"They will be reset to their default values."
-msgstr ""
-
-#. check subfolder preferences for bad values
-#: rapid/rapid.py:1283 rapid/rapid.py:1557
-msgid "photo"
-msgstr ""
-
-#: rapid/rapid.py:1284 rapid/rapid.py:1552
-msgid "video"
-msgstr ""
-
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1521
-msgid "externaldrive1"
-msgstr ""
-
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1523
-msgid "externaldrive2"
-msgstr ""
-
-#: rapid/rapid.py:1547 rapid/rapid.py:1681
-msgid "photos or videos"
-msgstr ""
-
-#: rapid/rapid.py:1550
-msgid "videos"
-msgstr ""
-
-#: rapid/rapid.py:1562
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
 "%(time)s"
 msgstr ""
+"%(date)s\n"
+"%(time)s"
 
-#: rapid/rapid.py:1564
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
-msgstr ""
+msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:1567
-#, python-format
-msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
-msgstr ""
-
-#: rapid/rapid.py:1574
+#: rapid/rapid.py:127
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
-msgstr ""
+msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/rapid.py:1602 rapid/rapid.py:2278
-msgid "subfolder and filename"
-msgstr ""
+#. Device refers to a thing like a camera, memory card in its reader,
+#. external hard drive, Portable Storage Device, etc.
+#: rapid/rapid.py:162
+msgid "Device"
+msgstr "Dispositivo"
 
-#: rapid/rapid.py:1604 rapid/rapid.py:2280
-msgid "filename"
-msgstr ""
+#. Size refers to the total size of images on the device, typically in
+#. MB or GB
+#: rapid/rapid.py:180
+msgid "Size"
+msgstr "Tamanho"
 
-#: rapid/rapid.py:1606 rapid/rapid.py:2282
-msgid "subfolder"
-msgstr ""
+#: rapid/rapid.py:183
+msgid "Download Progress"
+msgstr "Progresso da Transferência"
+
+#: rapid/rapid.py:343
+#, python-format
+msgid "%(device)s did not unmount"
+msgstr "%(device)s did not unmount"
 
 #. This refers to when a device like a hard drive is having its contents scanned,
 #. looking for photos or videos. It is visible initially in the progress bar for each device
 #. (which normally holds "x photos and videos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1697
+#: rapid/rapid.py:1241
 msgid "scanning..."
-msgstr ""
+msgstr "a analisar..."
 
-#: rapid/rapid.py:1812
-msgid "The following download path could not be created:\n"
-msgstr ""
+#. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
+#: rapid/rapid.py:1818
+msgid "the root of the file system"
+msgstr "a raiz do sistema de ficheiros"
 
-#: rapid/rapid.py:1813
+#. message in dialog box which asks the user if they really want to be downloading from this location
+#: rapid/rapid.py:1822
 #, python-format
-msgid "%(path)s: "
-msgstr ""
+msgid "Downloading from %(location)s."
+msgstr "A transferir de %(location)s."
 
-#: rapid/rapid.py:1814 rapid/rapid.py:1815 rapid/rapid.py:1830
-#: rapid/rapid.py:1831 rapid/rapid.py:2095 rapid/rapid.py:2098
-msgid "Download cannot proceed"
-msgstr ""
-
-#: rapid/rapid.py:1828 rapid/rapid.py:4999
-msgid "There is an error in the program preferences."
-msgstr ""
-
-#: rapid/rapid.py:1829
+#: rapid/rapid.py:1823
 msgid ""
-"\n"
-"Please check preferences, restart the program, and try again."
+"Do you really want to download from here? On some systems, scanning this "
+"location can take a very long time."
 msgstr ""
+"Quer realmente transferir deste local? Em alguns sistemas, varrer este local "
+"pode levar muito tempo."
 
-#. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-#. It refers to the actual number of photos that can be copied. For example, the user might see the following:
-#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
-#. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:2006
-#, python-format
-msgid "%(number)s %(filetypes)s"
-msgstr ""
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
+msgid "Download"
+msgstr "Transferir"
 
-#. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
-#. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-#. to the user when they run the program, signifying the number of photos found, and the device they were found on.
-#. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
-#. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
-#. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:2017
-#, python-format
-msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
-msgstr ""
-
-#: rapid/rapid.py:2024
-#, python-format
-msgid "Device scan complete: no %(filetypes)s found on %(device)s"
-msgstr ""
-
-#. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:2045
-msgid "The device can now be safely removed"
-msgstr ""
-
-#: rapid/rapid.py:2051
-#, python-format
-msgid "%(noFiles)s %(filetypes)s downloaded"
-msgstr ""
-
-#: rapid/rapid.py:2054
-#, python-format
-msgid "%(noFiles)s %(filetypes)s failed to download"
-msgstr ""
-
-#: rapid/rapid.py:2057 rapid/rapid.py:5792
-msgid "warnings"
-msgstr ""
-
-#: rapid/rapid.py:2059 rapid/rapid.py:5796
-msgid "errors"
-msgstr ""
+#: rapid/rapid.py:2270
+msgid "Pause"
+msgstr "Pausa"
 
-#: rapid/rapid.py:2089
-#, python-format
-msgid "Source: %s\n"
-msgstr ""
-
-#: rapid/rapid.py:2091
-#, python-format
-msgid "Device: %s\n"
-msgstr ""
-
-#: rapid/rapid.py:2092
-#, python-format
-msgid "Destination: %s"
-msgstr ""
-
-#: rapid/rapid.py:2093 rapid/rapid.py:2096
-msgid "Could not create temporary download directory"
-msgstr ""
-
-#: rapid/rapid.py:2096
-msgid "Error:"
-msgstr ""
-
-#: rapid/rapid.py:2120
-msgid "Backup path does not exist"
-msgstr ""
-
-#: rapid/rapid.py:2121
-#, python-format
-msgid "The path %s could not be created"
-msgstr ""
-
-#: rapid/rapid.py:2122
-msgid "No backups can occur"
-msgstr ""
-
-#: rapid/rapid.py:2151
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"%(problem)s"
+"These download folders are invalid:\n"
+"%(folder1)s\n"
+"%(folder2)s"
 msgstr ""
+"Estas pasteas de transferência são inválidas:\n"
+"%(folder1)s\n"
+"%(folder2)s"
 
-#: rapid/rapid.py:2182 rapid/rapid.py:2528 rapid/rapid.py:2563
-#: rapid/rapid.py:2591 rapid/rapid.py:2622 rapid/rapid.py:2641
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
-msgstr ""
-
-#. hopefully inst will never be None, but just to be safe...
-#: rapid/rapid.py:2197
-msgid "Please check your system and try again."
-msgstr ""
-
-#: rapid/rapid.py:2217
-msgid "Photos detected with the same filenames, but taken at different times"
+"This download folder is invalid:\n"
+"%s"
 msgstr ""
+"Essa pasta de download é inválida:\n"
+"%s"
 
-#: rapid/rapid.py:2257
-msgid "Photo has already been downloaded"
-msgstr ""
+#: rapid/rapid.py:2380
+msgid "Download cannot proceed"
+msgstr "A transferência não pôde continuar"
 
-#: rapid/rapid.py:2258 rapid/rapid.py:2657
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
 #, python-format
-msgid "Source: %(source)s"
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
 msgstr ""
+"Nenhum dispositivo de backup contém uma pasta válida para fazer o backup de "
+"%(filetype)s"
 
-#. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:2456
-msgid "New day has started - resetting 'Downloads Today' sequence number"
-msgstr ""
-
-#: rapid/rapid.py:2527
-#, python-format
-msgid "Backup of %(file_type)s already exists"
-msgstr ""
-
-#: rapid/rapid.py:2531
-#, python-format
-msgid "Backup %(file_type)s overwritten"
-msgstr ""
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "fotografias"
 
-#: rapid/rapid.py:2535
-#, python-format
-msgid "%(file_type)s not backed up to %(volume)s"
-msgstr ""
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "vídeos"
 
-#: rapid/rapid.py:2537
-#, python-format
-msgid "%(file_type)s not backed up"
-msgstr ""
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr "Problema no Backup"
 
-#: rapid/rapid.py:2560 rapid/rapid.py:2588 rapid/rapid.py:2621
-#: rapid/rapid.py:2640
-msgid "Backing up error"
-msgstr ""
+#: rapid/rapid.py:2802
+msgid "About 1 second remaining"
+msgstr "Falta aproximadamente 1 segundo"
 
-#: rapid/rapid.py:2561 rapid/rapid.py:2589
+#: rapid/rapid.py:2804
 #, python-format
-msgid "Destination directory could not be created: %(directory)s\n"
-msgstr ""
+msgid "About %i seconds remaining"
+msgstr "Falta aproximadamente %i segundos"
 
-#: rapid/rapid.py:2565 rapid/rapid.py:2624
-#, python-format
-msgid "Error: %(inst)s"
-msgstr ""
+#: rapid/rapid.py:2806
+msgid "About 1 minute remaining"
+msgstr "Falta aproximadamente 1 minuto"
 
-#: rapid/rapid.py:2566 rapid/rapid.py:2594 rapid/rapid.py:2625
-#: rapid/rapid.py:2644
+#. 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:2811
 #, python-format
-msgid "The %(file_type)s was not backed up."
-msgstr ""
+msgid "About %(minutes)i:%(seconds)02i minutes remaining"
+msgstr "Falta aproximadamente %(minutes)i:%(seconds)02i minutos"
 
-#: rapid/rapid.py:2593 rapid/rapid.py:2643
-#, python-format
-msgid "Error: %(errno)s %(strerror)s"
-msgstr ""
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
+msgid "photos and videos"
+msgstr "fotos e vídeos"
 
-#: rapid/rapid.py:2656
-#, python-format
-msgid "%(file_type)s could not be backed up"
-msgstr ""
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
+msgid "photos or videos"
+msgstr "fotos ou vídeos"
 
-#: rapid/rapid.py:2659
-msgid "No suitable backup volume was found"
-msgstr ""
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
+msgid "video"
+msgstr "vídeo"
 
-#: rapid/rapid.py:2661
-msgid "A backup location was not found"
-msgstr ""
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
+msgid "photo"
+msgstr "foto"
 
-#: rapid/rapid.py:2715
+#: rapid/rapid.py:2872
 #, python-format
-msgid "This device has no %(types_searched_for)s to download from."
-msgstr ""
+msgid "%(noFiles)s %(filetypes)s downloaded"
+msgstr "%(noFiles)s %(filetypes)s descarregados"
 
-#: rapid/rapid.py:2788
+#: rapid/rapid.py:2876
 #, python-format
-msgid "Download has started from %s"
-msgstr ""
+msgid "%(noFiles)s %(filetypes)s failed to download"
+msgstr "%(noFiles)s %(filetypes)s não puderam ser descarregados"
 
-#: rapid/rapid.py:2799
-#, python-format
-msgid "Attempting to download %s files"
-msgstr ""
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
+msgid "warnings"
+msgstr "avisos"
 
-#. reset the progress bar to update the status of this download attempt
-#: rapid/rapid.py:2831 rapid/rapid.py:2898
-#, python-format
-msgid "%(number)s of %(total)s %(filetypes)s"
-msgstr ""
+#: rapid/rapid.py:2892
+msgid "All downloads complete"
+msgstr "Todas transferências completas"
 
-#: rapid/rapid.py:2894
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
-msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
-msgstr ""
-
-#: rapid/rapid.py:2919 rapid/rapid.py:2923
-msgid "Could not delete photo or video from device"
-msgstr ""
+msgid "%(number)s %(numberdownloaded)s"
+msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2920
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
-msgid ""
-"Photo: %(source)s\n"
-"Error: %(errno)s %(strerror)s"
-msgstr ""
+msgid "%(filetype)s downloaded"
+msgstr "%(filetype)s transferidos"
 
-#: rapid/rapid.py:2924
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
-msgid "Photo: %(source)s"
-msgstr ""
+msgid "%(filetype)s failed to download"
+msgstr "%(filetype)s falhou a transferência"
 
-#: rapid/rapid.py:2926
+#. e.g.: 3 of 205 photos and videos (202 remaining)
+#: rapid/rapid.py:2970
 #, python-format
-msgid "Deleted %(number)i %(filetypes)s from device"
-msgstr ""
+msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
+msgstr "%(number)s de %(total)s %(filetypes)s (%(remaining)s restantes)"
 
-#: rapid/rapid.py:2939
+#. e.g.: 205 of 205 photos and videos
+#: rapid/rapid.py:2977
 #, python-format
-msgid "Download complete from %s"
-msgstr ""
-
-#. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:3054 rapid/rapid.py:3523
-msgid "Device"
-msgstr ""
-
-#. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:3059 rapid/rapid.py:3512
-msgid "Size"
-msgstr ""
-
-#: rapid/rapid.py:3062
-msgid "Download Progress"
-msgstr ""
-
-#: rapid/rapid.py:3150
-msgid "Downloading From Cameras"
-msgstr ""
-
-#: rapid/rapid.py:3156
-msgid "Downloading directly from a camera may work poorly or not at all"
-msgstr ""
-
-#: rapid/rapid.py:3157
-msgid ""
-"Downloading from a card reader always works and is generally much faster. It "
-"is strongly recommended to use a card reader."
-msgstr ""
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr "%(number)s de %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3171
-msgid "_Show this message again"
-msgstr ""
+#: rapid/rapid.py:3331
+msgid "From"
+msgstr "A partir de:"
 
-#: rapid/rapid.py:3206
-msgid "Device Detected"
-msgstr ""
+#: rapid/rapid.py:3339
+msgid "Auto Detect"
+msgstr "Detecção Automática"
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3215
-msgid ""
-"Should this device or partition be used to download photos or videos from?"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3234
-msgid "_Remember this choice"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3271
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
-msgid "%s selected for downloading from"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3274
-msgid "This device or partition will always be used to download from"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3277
-#, python-format
-msgid "%s rejected as a download device"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3280
-msgid "This device or partition will never be used to download from"
-msgstr ""
-
-#: rapid/rapid.py:3287
-msgid "Remove all Job Codes?"
-msgstr ""
-
-#: rapid/rapid.py:3304
-msgid "Should all Job Codes be removed?"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3332
-msgid "Enter a Job Code"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3351
-msgid "Enter a new Job Code, or select a previous one"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3354
-msgid "Enter a new Job Code"
-msgstr ""
-
-#: rapid/rapid.py:3359 rapid/rapid.py:4534
-msgid "Job Code:"
-msgstr ""
+msgid "Select a folder containing %(file_types)s"
+msgstr "Escolha um diretório que contenha %(file_types)s"
 
-#: rapid/rapid.py:3406
-msgid "Job Code entered"
-msgstr ""
+#: rapid/rapid.py:3384
+msgid "Copy"
+msgstr "Copiar"
 
-#: rapid/rapid.py:3408
-msgid "Job Code not entered"
-msgstr ""
+#: rapid/rapid.py:3397
+msgid "Move"
+msgstr "Mover"
 
-#: rapid/rapid.py:3458
-msgid "Status"
-msgstr ""
-
-#: rapid/rapid.py:3466
-msgid "Type"
-msgstr ""
+#: rapid/rapid.py:3419
+msgid "To"
+msgstr "Para:"
 
-#: rapid/rapid.py:3475 rapid/rapid.py:4961 rapid/rapid.py:4963
-msgid "Photo"
-msgstr ""
-
-#: rapid/rapid.py:3477
-msgid "File"
-msgstr ""
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
+msgid "Photos:"
+msgstr "Fotografias:"
 
-#: rapid/rapid.py:3492
-msgid "Job Code"
-msgstr ""
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
+msgid "Select a folder to download photos to"
+msgstr "Seleccione o diretório para onde transferir as fotos"
 
-#: rapid/rapid.py:3502
-msgid "Date"
-msgstr ""
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
+msgid "Videos:"
+msgstr "Vídeos:"
 
-#: rapid/rapid.py:3534 rapid/renamesubfolderprefs.py:195
-msgid "Filename"
-msgstr ""
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
+msgid "Select a folder to download videos to"
+msgstr "Seleccione o diretório para baixar os vídeos para"
 
-#: rapid/rapid.py:3545
-msgid "Path"
-msgstr ""
+#: rapid/rapid.py:3650
+msgid "and"
+msgstr "e"
 
-#: rapid/rapid.py:3955
-#, python-format
-msgid "%(filetype)s was downloaded successfully"
-msgstr ""
+#: rapid/rapid.py:3655
+msgid "Using backup devices"
+msgstr "A usar dispositivos de backup"
 
-#: rapid/rapid.py:3957
-#, python-format
-msgid "%(filetype)s was not downloaded"
-msgstr ""
+#: rapid/rapid.py:3657
+msgid "Using backup device"
+msgstr "A usar o dispositivo de backup"
 
-#: rapid/rapid.py:3959
-#, python-format
-msgid "%(filetype)s was downloaded with warnings"
-msgstr ""
+#: rapid/rapid.py:3659
+msgid "No backup devices detected"
+msgstr "Nenhum dispositivo de backup detectado"
 
-#: rapid/rapid.py:3961
-#, python-format
-msgid "%(filetype)s was downloaded but there were problems backing up"
-msgstr ""
+#: rapid/rapid.py:3686
+msgid "Free space:"
+msgstr "Espaço livre:"
 
-#: rapid/rapid.py:3963
+#. (videos) or (photos) will be appended to the free space message displayed to the
+#. user in the status bar.
+#. you should only translate this if your language does not use parantheses
+#: rapid/rapid.py:3698
 #, python-format
-msgid "%(filetype)s was neither downloaded nor backed up"
-msgstr ""
+msgid "(%(file_type)s)"
+msgstr "(%(file_type)s)"
 
-#: rapid/rapid.py:3965
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#: rapid/rapid.py:3702
 #, python-format
-msgid "%(filetype)s is ready to be downloaded"
-msgstr ""
+msgid "%(free)s %(file_type)s"
+msgstr "%(free)s %(file_type)s"
 
-#: rapid/rapid.py:3967
-#, python-format
-msgid "%(filetype)s is about to be downloaded"
-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:3707
+msgid "; "
+msgstr "; "
 
-#: rapid/rapid.py:3969
-#, python-format
-msgid "%(filetype)s will be downloaded with warnings"
-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:3712
+msgid "."
+msgstr "."
 
-#: rapid/rapid.py:3971
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#. e.g. 14.7GB available
+#: rapid/rapid.py:3718
 #, python-format
-msgid "%(filetype)s cannot be downloaded"
-msgstr ""
+msgid "%(free)s free"
+msgstr "%(free)s livres"
 
-#: rapid/rapid.py:4341
-msgid "Preview"
-msgstr ""
-
-#: rapid/rapid.py:4556
-msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
-msgstr ""
-
-#: rapid/rapid.py:4928
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3726
 #, python-format
-msgid "%(free)s available"
-msgstr ""
+msgid "Backing up photos and videos to %(path)s"
+msgstr "A criar o backup das fotos e vídeos em %(path)s"
 
 #. user manually specified backup location
-#: rapid/rapid.py:4934
+#: rapid/rapid.py:3729
 #, python-format
 msgid "Backing up to %(path)s"
-msgstr ""
+msgstr "A criar cópias de segurança em %(path)s"
 
-#: rapid/rapid.py:4939
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3732
 #, python-format
-msgid "%(freespace)s. %(backuppaths)s."
-msgstr ""
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr "A criar o backup das fotos em %(path)s e vídeos em %(path2)s"
 
-#: rapid/rapid.py:4948
+#: rapid/rapid.py:3739
 #, python-format
-msgid ""
-"Sorry, this device location does not exist:\n"
-"%(path)s\n"
-"\n"
-"Please resolve the problem, or modify your preferences."
-msgstr ""
+msgid "%(freespace)s. %(backuppaths)s."
+msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:4952
-msgid "Problem with Device Location Folder"
-msgstr ""
+#: rapid/rapid.py:3768
+msgid "Program preferences are invalid"
+msgstr "Preferências do programa são inválidas"
+
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
+msgid "Photo"
+msgstr "Fotografia"
 
-#: rapid/rapid.py:4961
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
-msgstr ""
+msgstr "Vídeo"
 
-#: rapid/rapid.py:4968
+#: rapid/rapid.py:3921
 #, python-format
-msgid "The %(file_type)s Download Folder does not exist.\n"
-msgstr ""
+msgid "%(file_type)s download folder does not exist"
+msgstr "%(file_type)s pasta de download não existe"
 
-#: rapid/rapid.py:4977
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
-msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
-msgstr ""
-
-#: rapid/rapid.py:4982
-msgid ""
-"Sorry, problems were encountered with your download folders. Please fix the "
-"problems or modify the preferences.\n"
-"\n"
-msgstr ""
-
-#: rapid/rapid.py:4985
-msgid "Problem with Download Folder"
-msgstr ""
+msgid "Folder: %s"
+msgstr "Pasta: %s"
 
-#: rapid/rapid.py:4987
-msgid "Problem with Download Folders"
-msgstr ""
-
-#: rapid/rapid.py:5000
-msgid "Some preferences will be reset."
-msgstr ""
-
-#: rapid/rapid.py:5033
-msgid "Displaying warning about downloading directly from camera"
-msgstr ""
-
-#: rapid/rapid.py:5043
+#: rapid/rapid.py:3935
 #, python-format
-msgid "Prompting whether to use %s"
-msgstr ""
-
-#: rapid/rapid.py:5070
-msgid "Prompting for Job Code"
-msgstr ""
+msgid "%(file_type)s download folder is invalid"
+msgstr "%(file_type)s pasta de transferência é inválida"
 
-#: rapid/rapid.py:5074
-msgid "Already prompting for Job Code, do not prompt again"
-msgstr ""
-
-#: rapid/rapid.py:5091
-msgid "Starting downloads"
-msgstr ""
-
-#. autostart is true
-#: rapid/rapid.py:5095
-msgid "Starting downloads that have been waiting for a Job Code"
-msgstr ""
-
-#: rapid/rapid.py:5142
+#: rapid/rapid.py:3948
 #, python-format
-msgid "Creating photo download folder %(folder)s"
-msgstr ""
+msgid "%(file_type)s download folder is not writable"
+msgstr "%(file_type)s pasta de transferência não é gravável"
 
-#: rapid/rapid.py:5147
-#, python-format
-msgid "Failed to create default photo download folder %(folder)s"
-msgstr ""
+#: rapid/rapid.py:4034
+msgid "Thumbnails"
+msgstr "Miniaturas"
 
-#: rapid/rapid.py:5151
-#, python-format
-msgid "Creating video download folder %(folder)s"
-msgstr ""
-
-#: rapid/rapid.py:5156
+#. Translators: this text is displayed to the user when they request information on the command line options.
+#. The text %default should not be modified or left out.
+#: rapid/rapid.py:4089
 #, python-format
-msgid "Failed to create default video download folder %(folder)s"
-msgstr ""
-
-#: rapid/rapid.py:5181
 msgid ""
-"A newer version of this program was previously run on this computer.\n"
-"\n"
-msgstr ""
-
-#: rapid/rapid.py:5183
-msgid ""
-"Program preferences appear to be valid, but please check them to ensure "
-"correct operation."
-msgstr ""
-
-#: rapid/rapid.py:5185
-msgid "Sorry, some preferences are invalid and will be reset."
+"display program information on the command line as the program runs "
+"(default: %default)"
 msgstr ""
+"exibir informaçṍes do programa na linha de comando enquando o programa é "
+"executado (default: %default)"
 
-#: rapid/rapid.py:5186
-msgid "Warning:"
+#: rapid/rapid.py:4090
+msgid "display debugging information when run from the command line"
 msgstr ""
+"mostrar informações de depuração quando executado a partir da linha de "
+"comando"
 
-#: rapid/rapid.py:5191
-msgid ""
-"This version of the program is newer than the previously run version. "
-"Checking preferences."
-msgstr ""
+#: rapid/rapid.py:4091
+msgid "only output errors to the command line"
+msgstr "mostrar erros apenas na linha de comando"
 
-#: rapid/rapid.py:5198
-msgid "Preferences were modified."
-msgstr ""
+#. image file extensions are recognized RAW files plus TIFF and JPG
+#: rapid/rapid.py:4093
+msgid "list photo and video file extensions the program recognizes and exit"
+msgstr "listar extensões de foto vídeo que o  programa reconhece e sair"
 
-#: rapid/rapid.py:5199
+#: rapid/rapid.py:4095
 msgid ""
-"This version of the program uses different preferences than the old version. "
-"Your preferences have been updated.\n"
-"\n"
-"Please check them to ensure correct operation."
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
 msgstr ""
+"detectar automaticamente os dispositivos dos quais transferir, "
+"sobrescrevendo as preferência do programa actuais"
 
-#: rapid/rapid.py:5203
-msgid "No preferences needed to be changed."
-msgstr ""
-
-#: rapid/rapid.py:5205
+#: rapid/rapid.py:4096
 msgid ""
-"This version of the program uses different preferences than the old version. "
-"Some of your previous preferences were invalid, and could not be updated. "
-"They will be reset."
-msgstr ""
-
-#: rapid/rapid.py:5215
-msgid "Problem using pynotify."
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
 msgstr ""
+"especificar manualmente o caminho do dispositivo para o qual transferir, "
+"sobrescrevendo as preferência do programa actuais"
 
-#: rapid/rapid.py:5231
-msgid "Failed to receive pynotify server capabilities."
+#: rapid/rapid.py:4097
+msgid "reset all program settings and preferences and exit"
 msgstr ""
+"Restabelecer todas as configurações e preferências do programa e fechá-lo"
 
-#: rapid/rapid.py:5242
+#: rapid/rapid.py:4110
 msgid ""
-"Warning: desktop environment notification server is incorrectly configured."
-msgstr ""
-
-#: rapid/rapid.py:5290
-msgid "and"
-msgstr ""
-
-#: rapid/rapid.py:5295
-msgid "Using backup devices"
-msgstr ""
-
-#: rapid/rapid.py:5297
-msgid "Using backup device"
+"Error: specify device auto-detection or manually specify a device's path "
+"from which to download, but do not do both."
 msgstr ""
+"Erro: especificar a auto-detecção do dispositivo ou especificar manualmente "
+"o caminho de um dispositivo para o qual transferir, mas não ambos."
 
-#: rapid/rapid.py:5299
-msgid "No backup devices detected"
-msgstr ""
-
-#: rapid/rapid.py:5349 rapid/rapid.py:5511
-#, python-format
-msgid "Device %(device)s (%(path)s) ignored"
-msgstr ""
-
-#: rapid/rapid.py:5470
+#: rapid/rapid.py:4133
 #, python-format
-msgid "Detected %(device)s with path %(path)s"
-msgstr ""
-
-#: rapid/rapid.py:5474
-msgid "Automatically start download is true"
-msgstr ""
+msgid "and %s"
+msgstr "e %s"
 
-#: rapid/rapid.py:5476
-msgid "Automatically start download is false"
-msgstr ""
+#: rapid/rapid.py:4141
+msgid "All settings and preferences have been reset"
+msgstr "Todas as configurações e preferências foram redefinidas"
 
-#: rapid/rapid.py:5529
-msgid "Using manually specified path"
-msgstr ""
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
+msgid "Backing up error"
+msgstr "Erro ao criar cópias de segurança"
 
-#. the user is trying to backup to a device that is currently being downloaded from..... we don't normally allow that, but what to do?
-#: rapid/rapid.py:5597
+#: rapid/backupfile.py:151
 #, python-format
-msgid "Warning: backup device %(device)s is currently being downloaded from"
-msgstr ""
-
-#: rapid/rapid.py:5613
-msgid "D_ownload Selected"
-msgstr ""
-
-#: rapid/rapid.py:5713 rapid/rapid.py:5764
-msgid "All downloads complete"
-msgstr ""
-
-#: rapid/rapid.py:5728
-msgid "MB/s"
-msgstr ""
-
-#: rapid/rapid.py:5738
-msgid "About 1 second remaining"
-msgstr ""
+msgid "Destination directory could not be created: %(directory)s\n"
+msgstr "Diretório de destino não pôde ser criado: %(directory)s\n"
 
-#: rapid/rapid.py:5740
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
-msgid "About %i seconds remaining"
-msgstr ""
-
-#: rapid/rapid.py:5742
-msgid "About 1 minute remaining"
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
 msgstr ""
+"Origem: %(source)s\n"
+"Destino: %(destination)s"
 
-#. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
-#. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
-#. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:5747
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
-msgid "About %(minutes)i:%(seconds)02i minutes remaining"
-msgstr ""
+msgid "Error: %(inst)s"
+msgstr "Erro: %(inst)s"
 
-#: rapid/rapid.py:5767 rapid/rapid.py:5773 rapid/rapid.py:5779
-#: rapid/rapid.py:5785 rapid/rapid.py:5790 rapid/rapid.py:5794
+#: rapid/backupfile.py:163
 #, python-format
-msgid "%(number)s %(numberdownloaded)s"
-msgstr ""
+msgid "Backup %(file_type)s overwritten"
+msgstr "%(file_type)s do backup sobreescritos"
 
-#: rapid/rapid.py:5769 rapid/rapid.py:5781
+#: rapid/backupfile.py:166
 #, python-format
-msgid "%(filetype)s downloaded"
-msgstr ""
+msgid "%(file_type)s not backed up"
+msgstr "%(file_type)s ainda não estão no backup"
 
-#: rapid/rapid.py:5775 rapid/rapid.py:5787
+#: rapid/backupfile.py:168
 #, python-format
-msgid "%(filetype)s failed to download"
-msgstr ""
-
-#: rapid/rapid.py:5955
-msgid "_Resume"
-msgstr ""
-
-#: rapid/rapid.py:5958
-msgid "_Download All"
-msgstr ""
-
-#. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:5967
-msgid "_Pause"
-msgstr ""
-
-#: rapid/rapid.py:6079
-msgid "Download device settings preferences were changed."
-msgstr ""
-
-#: rapid/rapid.py:6091
-msgid "Backup preferences were changed."
-msgstr ""
-
-#: rapid/rapid.py:6097
-msgid "Subfolder and filename preferences were changed."
-msgstr ""
-
-#: rapid/rapid.py:6108
-msgid "Download folder preferences were changed."
-msgstr ""
-
-#: rapid/rapid.py:6307
-msgid "Goodbye"
-msgstr ""
+msgid "Backup of %(file_type)s already exists"
+msgstr "O backup de %(file_type)s já existe"
 
-#. Translators: this text is displayed to the user when they request information on the command line options.
-#. The text %default should not be modified or left out.
-#: rapid/rapid.py:6318
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
-"display program information on the command line as the program runs "
-"(default: %default)"
-msgstr ""
-
-#: rapid/rapid.py:6319
-msgid "display debugging information when run from the command line"
-msgstr ""
-
-#: rapid/rapid.py:6320
-msgid "only output errors to the command line"
-msgstr ""
-
-#. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:6322
-msgid "list photo and video file extensions the program recognizes and exit"
+"%(problem)s\n"
+"File: %(file)s"
 msgstr ""
+"%(problem)s\n"
+"Arquivo: %(file)s"
 
-#: rapid/rapid.py:6323
-msgid "reset all program settings and preferences and exit"
-msgstr ""
-
-#: rapid/rapid.py:6337
-msgid "Photos:"
-msgstr ""
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr "Ocorreu um erro desconhecido"
 
-#: rapid/rapid.py:6337
-msgid "Videos:"
-msgstr ""
-
-#: rapid/rapid.py:6342
-#, python-format
-msgid "and %s"
-msgstr ""
-
-#: rapid/rapid.py:6350
-msgid "All settings and preferences have been reset"
-msgstr ""
+#: rapid/device.py:80
+msgid "Device Detected"
+msgstr "Dispositivo detectado"
 
-#. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:6354 rapid/rapid.py:6355 rapid/rapid.py:6357
-#: rapid/rapid.py:6362 rapid/rapid.py:6366
-msgid "Using"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/device.py:89
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
 msgstr ""
+"Deverá ser feita uma tranferência das fotografias ou vídeos presentes neste "
+"dispositivo ou partição?"
 
-#: rapid/rapid.py:6359
-msgid "\n"
-msgstr ""
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/device.py:108
+msgid "_Remember this choice"
+msgstr "_Recordar esta escolha"
 
-#. this application is already running
-#: rapid/rapid.py:6383
-#, python-format
-msgid "%s is already running"
-msgstr ""
+#: rapid/downloadtracker.py:299
+msgid "MB/s"
+msgstr "MB/s"
 
-#: rapid/renamesubfolderprefs.py:193
+#: rapid/generatenameconfig.py:151
 msgid "Date time"
-msgstr ""
+msgstr "Data e hora"
 
-#: rapid/renamesubfolderprefs.py:194
+#: rapid/generatenameconfig.py:152
 msgid "Text"
-msgstr ""
+msgstr "Texto"
+
+#: rapid/generatenameconfig.py:153
+msgid "Filename"
+msgstr "Nome do ficheiro"
 
-#: rapid/renamesubfolderprefs.py:196
+#: rapid/generatenameconfig.py:154
 msgid "Metadata"
-msgstr ""
+msgstr "Detalhes"
 
-#: rapid/renamesubfolderprefs.py:197
+#: rapid/generatenameconfig.py:155
 msgid "Sequences"
-msgstr ""
+msgstr "Sequências"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/generatenameconfig.py:157 rapid/preferencesdialog.py:577
+msgid "Job code"
+msgstr "Etiqueta"
 
-#: rapid/renamesubfolderprefs.py:200
+#: rapid/generatenameconfig.py:158
 msgid "Image date"
-msgstr ""
+msgstr "Imagem de dados"
 
-#: rapid/renamesubfolderprefs.py:201
+#: rapid/generatenameconfig.py:159
 msgid "Video date"
-msgstr ""
+msgstr "Dados de vídeo"
 
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/generatenameconfig.py:160
 msgid "Today"
-msgstr ""
+msgstr "Hoje"
 
-#: rapid/renamesubfolderprefs.py:203
+#: rapid/generatenameconfig.py:161
 msgid "Yesterday"
-msgstr ""
+msgstr "Ontem"
 
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/renamesubfolderprefs.py:205
+#: rapid/generatenameconfig.py:163
 msgid "Download time"
-msgstr ""
+msgstr "Início da transferência"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:207
+#: rapid/generatenameconfig.py:165
 msgid "Name + extension"
-msgstr ""
+msgstr "Nome + extensão"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:209
+#: rapid/generatenameconfig.py:167
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:211
+#: rapid/generatenameconfig.py:169
 msgid "Extension"
-msgstr ""
+msgstr "Extensão"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:213
+#: rapid/generatenameconfig.py:171
 msgid "Image number"
-msgstr ""
+msgstr "Número da imagem"
 
-#: rapid/renamesubfolderprefs.py:214
+#: rapid/generatenameconfig.py:172
 msgid "Video number"
-msgstr ""
+msgstr "Número do vídeo"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:216
+#: rapid/generatenameconfig.py:174
 msgid "Aperture"
-msgstr ""
+msgstr "Abertura"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:218
+#: rapid/generatenameconfig.py:176
 msgid "ISO"
-msgstr ""
+msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:220
+#: rapid/generatenameconfig.py:178
 msgid "Exposure time"
-msgstr ""
+msgstr "Tempo de exposição"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:222
+#: rapid/generatenameconfig.py:180
 msgid "Focal length"
-msgstr ""
+msgstr "Distância focal"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:224
+#: rapid/generatenameconfig.py:182
 msgid "Camera make"
-msgstr ""
+msgstr "Marca da câmara"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:226
+#: rapid/generatenameconfig.py:184
 msgid "Camera model"
-msgstr ""
+msgstr "Modelo da câmara"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:228
+#: rapid/generatenameconfig.py:186
 msgid "Short camera model"
-msgstr ""
+msgstr "Modelo de câmara curta"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:230
+#: rapid/generatenameconfig.py:188
 msgid "Hyphenated short camera model"
-msgstr ""
+msgstr "Modelo hifenizado de câmara curta"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:232
+#: rapid/generatenameconfig.py:190
 msgid "Serial number"
-msgstr ""
+msgstr "Número de série"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:234
+#: rapid/generatenameconfig.py:192
 msgid "Shutter count"
-msgstr ""
+msgstr "Contagem de Disparos"
+
+#. File number currently refers to the Exif value Exif.Canon.FileNumber
+#: rapid/generatenameconfig.py:194
+msgid "File number"
+msgstr "Número de ficheiro"
+
+#. Only the folder component of the Exif.Canon.FileNumber value
+#: rapid/generatenameconfig.py:196
+msgid "Folder only"
+msgstr "Apenas pasta"
+
+#. The folder and file component of the Exif.Canon.FileNumber value
+#: rapid/generatenameconfig.py:198
+msgid "Folder and file"
+msgstr "Pasta e arquivo"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:236
+#: rapid/generatenameconfig.py:200
 msgid "Owner name"
-msgstr ""
+msgstr "Nome do proprietário"
 
-#: rapid/renamesubfolderprefs.py:237
+#: rapid/generatenameconfig.py:201
 msgid "Codec"
-msgstr ""
+msgstr "Codec"
 
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/generatenameconfig.py:202
 msgid "Width"
-msgstr ""
+msgstr "Largura"
 
-#: rapid/renamesubfolderprefs.py:239
+#: rapid/generatenameconfig.py:203
 msgid "Height"
-msgstr ""
+msgstr "Altura"
 
-#: rapid/renamesubfolderprefs.py:240
+#: rapid/generatenameconfig.py:204
 msgid "Length"
-msgstr ""
+msgstr "Duração"
 
-#: rapid/renamesubfolderprefs.py:241
+#: rapid/generatenameconfig.py:205
 msgid "Frames Per Second"
-msgstr ""
+msgstr "Quadros por Segundo"
+
+#: rapid/generatenameconfig.py:206
+msgid "Artist"
+msgstr "Artista"
+
+#: rapid/generatenameconfig.py:207
+msgid "Copyright"
+msgstr "Direitos de Autor"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:243
+#: rapid/generatenameconfig.py:209
 msgid "Downloads today"
-msgstr ""
+msgstr "Transferências hoje"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/generatenameconfig.py:211
 msgid "Session number"
-msgstr ""
+msgstr "Número da sessão"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/generatenameconfig.py:213
 msgid "Subfolder number"
-msgstr ""
+msgstr "Número da subpasta"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/generatenameconfig.py:215
 msgid "Stored number"
-msgstr ""
+msgstr "Número armazenado"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:251
+#: rapid/generatenameconfig.py:217
 msgid "Sequence letter"
-msgstr ""
+msgstr "Sequência de letras"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/generatenameconfig.py:219
 msgid "All digits"
-msgstr ""
+msgstr "Todos os dígitos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/generatenameconfig.py:221
 msgid "Last digit"
-msgstr ""
+msgstr "Último dígito"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/generatenameconfig.py:223
 msgid "Last 2 digits"
-msgstr ""
+msgstr "Últimos 2 dígitos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/generatenameconfig.py:225
 msgid "Last 3 digits"
-msgstr ""
+msgstr "Últimos 3 dígitos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/generatenameconfig.py:227
 msgid "Last 4 digits"
-msgstr ""
+msgstr "Últimos 4 dígitos"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/generatenameconfig.py:229
 msgid "Original Case"
-msgstr ""
+msgstr "Caixa Original"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/generatenameconfig.py:231
 msgid "UPPERCASE"
-msgstr ""
+msgstr "MAIÚSCULAS"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/generatenameconfig.py:233
 msgid "lowercase"
-msgstr ""
+msgstr "minúsculas"
 
-#: rapid/renamesubfolderprefs.py:268
+#: rapid/generatenameconfig.py:234
 msgid "One digit"
-msgstr ""
+msgstr "Um dígito"
 
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/generatenameconfig.py:235
 msgid "Two digits"
-msgstr ""
+msgstr "Dois dígitos"
 
-#: rapid/renamesubfolderprefs.py:270
+#: rapid/generatenameconfig.py:236
 msgid "Three digits"
-msgstr ""
+msgstr "Três dígitos"
 
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/generatenameconfig.py:237
 msgid "Four digits"
-msgstr ""
+msgstr "Quatro dígitos"
 
-#: rapid/renamesubfolderprefs.py:272
+#: rapid/generatenameconfig.py:238
 msgid "Five digits"
-msgstr ""
+msgstr "Cinco dígitos"
 
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/generatenameconfig.py:239
 msgid "Six digits"
-msgstr ""
+msgstr "Seis dígitos"
 
-#: rapid/renamesubfolderprefs.py:274
+#: rapid/generatenameconfig.py:240
 msgid "Seven digits"
-msgstr ""
+msgstr "Sete dígitos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:276
+#: rapid/generatenameconfig.py:242
 msgid "Subseconds"
-msgstr ""
+msgstr "Subsegundos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:278
+#: rapid/generatenameconfig.py:244
 msgid "YYYYMMDD"
-msgstr ""
+msgstr "AAAAMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:280
+#: rapid/generatenameconfig.py:246
 msgid "YYYY-MM-DD"
-msgstr ""
+msgstr "AAAA-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:282
+#: rapid/generatenameconfig.py:248
 msgid "YYMMDD"
-msgstr ""
+msgstr "AAMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:284
+#: rapid/generatenameconfig.py:250
 msgid "YY-MM-DD"
-msgstr ""
+msgstr "AA-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:286
+#: rapid/generatenameconfig.py:252
 msgid "MMDDYYYY"
-msgstr ""
+msgstr "MMDDAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:288
+#: rapid/generatenameconfig.py:254
 msgid "MMDDYY"
-msgstr ""
+msgstr "MMDDAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:290
+#: rapid/generatenameconfig.py:256
 msgid "MMDD"
-msgstr ""
+msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:292
+#: rapid/generatenameconfig.py:258
 msgid "DDMMYYYY"
-msgstr ""
+msgstr "DDMMAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:294
+#: rapid/generatenameconfig.py:260
 msgid "DDMMYY"
-msgstr ""
+msgstr "DDMMAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:296
+#: rapid/generatenameconfig.py:262
 msgid "YYYY"
-msgstr ""
+msgstr "AAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:298
+#: rapid/generatenameconfig.py:264
 msgid "YY"
-msgstr ""
+msgstr "AA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:300
+#: rapid/generatenameconfig.py:266
 msgid "MM"
-msgstr ""
+msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:302
+#: rapid/generatenameconfig.py:268
 msgid "DD"
-msgstr ""
+msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:304
+#: rapid/generatenameconfig.py:270
+msgid "Month (full)"
+msgstr "Mês (inteiro)"
+
+#. 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ês (Abreviado)"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:274
 msgid "HHMMSS"
-msgstr ""
+msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:306
+#: rapid/generatenameconfig.py:276
 msgid "HHMM"
-msgstr ""
+msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:308
+#: rapid/generatenameconfig.py:278
 msgid "HH-MM-SS"
-msgstr ""
+msgstr "HH-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:310
+#: rapid/generatenameconfig.py:280
 msgid "HH-MM"
-msgstr ""
+msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:312
+#: rapid/generatenameconfig.py:282
 msgid "HH"
-msgstr ""
+msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:314
+#: rapid/generatenameconfig.py:284
 msgid "MM (minutes)"
-msgstr ""
+msgstr "MM (minutos)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:316
+#: rapid/generatenameconfig.py:286
 msgid "SS"
-msgstr ""
-
-#: rapid/renamesubfolderprefs.py:801
-#, python-format
-msgid ""
-"Preference key '%(key)s' is invalid.\n"
-"Expected one of %(value)s"
-msgstr ""
+msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:808
-#, python-format
-msgid "Preference value '%(value)s' is invalid"
-msgstr ""
-
-#: rapid/renamesubfolderprefs.py:812
-msgid "These preferences are not well formed:"
-msgstr ""
-
-#: rapid/renamesubfolderprefs.py:1525
+#: rapid/preferencesdialog.py:374
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
-msgstr ""
+msgstr "Preferências de subpasta não devem começar com %s"
 
-#: rapid/renamesubfolderprefs.py:1527
+#: rapid/preferencesdialog.py:376
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
-msgstr ""
+msgstr "Preferências de subpasta não devem terminar com %s"
 
-#: rapid/renamesubfolderprefs.py:1531
+#: rapid/preferencesdialog.py:380
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
-msgstr ""
+msgstr "Preferências de subpasta não devem conter dois %s um após o outro"
 
-#: rapid/glade3/rapid.glade.h:1
-msgid " "
-msgstr ""
+#: rapid/preferencesdialog.py:439 rapid/preferencesdialog.py:700
+msgid "Remove all Job Codes?"
+msgstr "Remover todas os Códigos de Tarefas?"
 
-#: rapid/glade3/rapid.glade.h:2
-msgid "      "
-msgstr ""
+#: rapid/preferencesdialog.py:440 rapid/preferencesdialog.py:717
+msgid "Should all Job Codes be removed?"
+msgstr "Deseja realmente remover todas os Códigos de Tarefas?"
 
-#: rapid/glade3/rapid.glade.h:3
-msgid " hh:mm"
-msgstr ""
+#: rapid/preferencesdialog.py:446
+msgid "Remove all Remembered Paths?"
+msgstr "Remover todos os caminhos recordados?"
 
-#: rapid/glade3/rapid.glade.h:4
-msgid ":"
-msgstr ""
+#: rapid/preferencesdialog.py:447
+msgid "Should all remembered paths be removed?"
+msgstr "Todos os caminhos recordados  devem ser removidos?"
 
-#: rapid/glade3/rapid.glade.h:5
-msgid "<b>Backup</b>"
-msgstr ""
+#: rapid/preferencesdialog.py:453
+msgid "Remove all Ignored Paths?"
+msgstr "Remover todos os caminhos ignorados?"
 
-#: rapid/glade3/rapid.glade.h:6
-msgid "<b>Compatibility with Other Operating Systems</b>"
-msgstr ""
+#: rapid/preferencesdialog.py:454
+msgid "Should all ignored paths be removed?"
+msgstr "Todos os caminhos ignorados devem ser removidos?"
 
-#: rapid/glade3/rapid.glade.h:7
-msgid "<b>Devices</b>"
-msgstr ""
+#: rapid/preferencesdialog.py:465
+msgid "Error in Photo Rename preferences"
+msgstr "Erro causado pelas preferêcias de \"renomear fotografias\""
 
-#: rapid/glade3/rapid.glade.h:8
-msgid "<b>Download Folder</b>"
-msgstr ""
+#: rapid/preferencesdialog.py:645
+msgid "Error in Video Rename preferences"
+msgstr "Erro causado pelas preferêcias de \"renomear vídeos\""
 
-#: rapid/glade3/rapid.glade.h:9
-msgid "<b>Download Subfolders</b>"
+#: rapid/preferencesdialog.py:666
+msgid "Error in Photo Download Subfolders preferences"
 msgstr ""
+"Erro causado pelas preferêcias de subdiretórios em \"diretórios de "
+"fotografias\""
 
-#: rapid/glade3/rapid.glade.h:10
-msgid "<b>Example</b>"
+#: rapid/preferencesdialog.py:683
+msgid "Error in Video Download Subfolders preferences"
 msgstr ""
+"Erro causado pelas preferêcias de subdiretórios em \"diretórios de vídeo\""
 
-#: rapid/glade3/rapid.glade.h:11
-msgid "<b>Job Codes</b>"
-msgstr ""
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:742
+msgid "Enter a Job Code"
+msgstr "Introduzir um Código de Tarefa"
 
-#: rapid/glade3/rapid.glade.h:12
-msgid "<b>Photo Rename</b>"
-msgstr ""
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:758
+msgid "Enter a new Job Code, or select a previous one"
+msgstr "Defina um novo Código de Tarefa or seleccione um já existente"
 
-#: rapid/glade3/rapid.glade.h:13
-msgid "<b>Photo and Video Name Conflicts</b>"
-msgstr ""
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:761
+msgid "Enter a new Job Code"
+msgstr "Introduza um novo Código de Tarefa"
 
-#: rapid/glade3/rapid.glade.h:14
-msgid "<b>Program Automation</b>"
-msgstr ""
+#: rapid/preferencesdialog.py:766
+msgid "Job Code:"
+msgstr "Código de Tarefa:"
 
-#: rapid/glade3/rapid.glade.h:15
-msgid "<b>Sequence Numbers</b>"
-msgstr ""
+#: rapid/preferencesdialog.py:822
+msgid "Enter a Path to Ignore"
+msgstr "Introduza um Caminho a ser Ignorado"
 
-#: rapid/glade3/rapid.glade.h:16
-msgid "<i>/media/externaldrive/Photos</i>"
-msgstr ""
+#: rapid/preferencesdialog.py:834
+msgid "Specify a path that will never be scanned for photos or videos"
+msgstr "Especifique um caminho onde fotos e vídeos não devem ser procurados"
 
-#: rapid/glade3/rapid.glade.h:17
-msgid "<i>Example: /home/user/Pictures</i>"
-msgstr ""
+#: rapid/preferencesdialog.py:839
+msgid "Path:"
+msgstr "Caminho:"
 
-#: rapid/glade3/rapid.glade.h:18
-msgid "<i>Example:</i>"
-msgstr ""
+#: rapid/preferencesdialog.py:1092
+msgid "Job Code"
+msgstr "Código de Tarefa"
 
-#: rapid/glade3/rapid.glade.h:19
-msgid "<i>New:</i>"
-msgstr ""
+#: rapid/preferencesdialog.py:1363
+msgid "Select a folder in which to backup photos"
+msgstr "Seleccione uma pasta onde será guardado o backup das fotos"
 
-#: rapid/glade3/rapid.glade.h:20
-msgid "<i>Original:</i>"
-msgstr ""
+#: rapid/preferencesdialog.py:1376
+msgid "Select a folder in which to backup videos"
+msgstr "Seleccione uma pasta onde será guardado o backup dos vídeos"
 
-#: rapid/glade3/rapid.glade.h:21
-msgid "<span weight=\"bold\" size=\"x-large\">Automation</span>"
+#. 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:1473
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
 msgstr ""
+"<i><b>Aviso:</b> As meta-Informações disponíveis são insuficientes para "
+"gerar um nome de arquivo. Por favor, use outras opções de renomeação.</i>"
 
-#: rapid/glade3/rapid.glade.h:22
-msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+#: rapid/preferencesdialog.py:1524
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
+"subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
+"<i><b>Aviso:</b> As meta-Informações disponíveis são insuficientes para "
+"gerar nomes de subdiretórios. Por favor, use de outras opções de "
+"nomeação.</i>"
 
-#: rapid/glade3/rapid.glade.h:23
-msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
-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:1527
+#, python-format
+msgid "<i>Example: %s</i>"
+msgstr "<i>Exemplo: %s</i>"
 
-#: rapid/glade3/rapid.glade.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
+#. Preferences list is now empty
+#: rapid/preferencesdialog.py:1617
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
+"They will be reset to their default values."
 msgstr ""
+"As preferências definidas para os subdiretórios de %(filetype)s são "
+"inválidas e não poderão ser usadas.\n"
+"Elas serão redefinidas para seus valores padrão."
 
-#: rapid/glade3/rapid.glade.h:25
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+#: rapid/preferencesdialog.py:1762
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
 msgstr ""
+"As seguintes expressões regulares não são válidas e serão removidas a não "
+"ser que sejam corrigidas:\n"
+"%s"
 
-#: rapid/glade3/rapid.glade.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+#: rapid/preferencesdialog.py:1764
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
 msgstr ""
+"Esta expressão regular é inválida e será removida a não ser que seja "
+"corrigida:\n"
+"%s"
 
-#: rapid/glade3/rapid.glade.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
-msgstr ""
+#: rapid/preferencesdialog.py:1765
+msgid "Invalid regular expression"
+msgstr "Expressão regular inválida"
 
-#: rapid/glade3/rapid.glade.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
-msgstr ""
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1949
+msgid "externaldrive1"
+msgstr "discoexterno1"
 
-#: rapid/glade3/rapid.glade.h:29
-msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
-msgstr ""
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1951
+msgid "externaldrive2"
+msgstr "discoexterno2"
 
-#: rapid/glade3/rapid.glade.h:30
-msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
-msgstr ""
+#: rapid/prefsrapid.py:127
+msgid "New York"
+msgstr "Nova Iorque"
 
-#: rapid/glade3/rapid.glade.h:31
-msgid "Add unique identifier"
-msgstr ""
+#: rapid/prefsrapid.py:128
+msgid "Manila"
+msgstr "Manila"
 
-#: rapid/glade3/rapid.glade.h:32
-msgid "Automatically detect Portable Storage Devices"
-msgstr ""
+#: rapid/prefsrapid.py:128
+msgid "Prague"
+msgstr "Praga"
 
-#: rapid/glade3/rapid.glade.h:33
-msgid "Automatically detect backup devices"
-msgstr ""
+#: rapid/prefsrapid.py:128
+msgid "Helsinki"
+msgstr "Helsinki"
 
-#: rapid/glade3/rapid.glade.h:34
-msgid "Automatically detect devices"
-msgstr ""
+#: rapid/prefsrapid.py:128
+msgid "Wellington"
+msgstr "Wellington"
 
-#: rapid/glade3/rapid.glade.h:35
-msgid "Automation"
-msgstr ""
+#: rapid/prefsrapid.py:129
+msgid "Tehran"
+msgstr "Teerã"
 
-#: rapid/glade3/rapid.glade.h:36
-msgid "Backup"
-msgstr ""
+#: rapid/prefsrapid.py:129
+msgid "Kampala"
+msgstr "Kampala"
 
-#: rapid/glade3/rapid.glade.h:37
-msgid "Backup location:"
-msgstr ""
+#: rapid/prefsrapid.py:129
+msgid "Paris"
+msgstr "Paris"
 
-#: rapid/glade3/rapid.glade.h:38
-msgid "Backup photos and videos when downloading"
-msgstr ""
+#: rapid/prefsrapid.py:129
+msgid "Berlin"
+msgstr "Berlim"
+
+#: rapid/prefsrapid.py:129
+msgid "Sydney"
+msgstr "Sydney"
+
+#: rapid/prefsrapid.py:130
+msgid "Budapest"
+msgstr "Budapeste"
+
+#: rapid/prefsrapid.py:130
+msgid "Rome"
+msgstr "Roma"
+
+#: rapid/prefsrapid.py:130
+msgid "Moscow"
+msgstr "Moscovo"
 
-#: rapid/glade3/rapid.glade.h:39
+#: rapid/prefsrapid.py:130
+msgid "Delhi"
+msgstr "Deli"
+
+#: rapid/prefsrapid.py:130
+msgid "Warsaw"
+msgstr "Varsóvia"
+
+#: rapid/prefsrapid.py:131
+msgid "Jakarta"
+msgstr "Jacarta"
+
+#: rapid/prefsrapid.py:131
+msgid "Madrid"
+msgstr "Madrid"
+
+#: rapid/prefsrapid.py:131
+msgid "Stockholm"
+msgstr "Estocolmo"
+
+#. components
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
+msgid "subfolder"
+msgstr "subpasta"
+
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
+msgid "filename"
+msgstr "nome do ficheiro"
+
+#: rapid/problemnotification.py:85
+#, python-format
+msgid "Date time value %s appears invalid."
+msgstr "O valor %s de data e hora parece inválido."
+
+#: rapid/problemnotification.py:86
+msgid "Filename does not have an extension."
+msgstr "Nome do arquivo não tem extensão."
+
+#. a number component is something like the 8346 in IMG_8346.JPG
+#: rapid/problemnotification.py:88
+msgid "Filename does not have a number component."
+msgstr "Nome do arquivo não tem um componente número."
+
+#: rapid/problemnotification.py:89
+#, python-format
+msgid "Error generating component %s."
+msgstr "Erro ao gerar o componente %s"
+
+#. a generic problem
+#: rapid/problemnotification.py:91
+#, python-format
+msgid "%(filetype)s metadata cannot be read"
+msgstr "Os metadados de %(filetype)s não podem ser lidos"
+
+#: rapid/problemnotification.py:93
+#, python-format
+msgid "%(filetype)s %(area)s could not be generated"
+msgstr "%(filetype)s %(area)s não pode ser gerado"
+
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
+#, python-format
+msgid "An error occurred when copying the %(filetype)s"
+msgstr "Ocorreu um erro ao copiar %(filetype)s"
+
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr "%(filetype)s não foram transferidos correctamente."
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
+#, python-format
+msgid "%(filetype)s already exists"
+msgstr "%(filetype)s já existe."
+
+#: rapid/problemnotification.py:105
+#, python-format
 msgid ""
-"Choose the download folder. Subfolders for the downloaded photos will be "
-"automatically created in this folder using the structure specified below."
+"%(filetype)s could not be backed up because no suitable backup locations "
+"were found."
 msgstr ""
+"%(filetype)s não pôde ser guardado em backup porque nenhum local de backup "
+"foi encontrado."
 
-#: rapid/glade3/rapid.glade.h:40
+#: rapid/problemnotification.py:110
+#, python-format
 msgid ""
-"Choose the download folder. Subfolders for the downloaded videos will be "
-"automatically created in this folder using the structure specified below."
+"%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
+"on %(image2_date)s at %(image2_time)s."
 msgstr ""
+"%(image1)s foi tirada em %(image1_date)s em %(image1_time)s, e %(image2)s em "
+"%(image2_date)s em %(image2_time)s."
 
-#: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-10"
-msgstr ""
+#: rapid/problemnotification.py:111
+#, python-format
+msgid "%(filetype)s was already downloaded"
+msgstr "%(filetype)s já foi transferido."
 
-#: rapid/glade3/rapid.glade.h:42
-msgid "Day start:"
+#: rapid/problemnotification.py:115
+#, python-format
+msgid ""
+"The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+"identifier '%(identifier)s' added."
 msgstr ""
+"O actual%(filetype)s foi modificado pela última vez em%(date)s em%(time)s. "
+"Identificador exclusivo '%(identifier)s'' acrescentado."
 
-#: rapid/glade3/rapid.glade.h:43
-msgid "Delete photos and videos from device upon download completion"
+#: rapid/problemnotification.py:116
+#, python-format
+msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
+"O %(filetype)s existente foi modificado pela última vez em %(date)s as "
+"%(time)s."
 
-#: rapid/glade3/rapid.glade.h:44
-msgid "Devices"
-msgstr ""
+#: rapid/problemnotification.py:117
+#, python-format
+msgid "There is no data with which to name the %(filetype)s."
+msgstr "Não há dados com os quais o nome %(filetype)s."
+
+#: rapid/problemnotification.py:119
+#, python-format
+msgid "Error: %(errorno)s %(strerror)s"
+msgstr "Erro: %(errorno)s %(strerror)s"
 
-#: rapid/glade3/rapid.glade.h:45
+#: rapid/problemnotification.py:210
 msgid ""
-"Devices are from where to download photos and videos, such as cameras, "
-"memory cards or Portable Storage Devices.\n"
-"\n"
-"You can download photos from multiple devices simultaneously, or you can "
-"specify a location on your hard drive.\n"
-"\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
+"File verification failed. The downloaded version is different from the "
+"original."
 msgstr ""
+"Verificação do ficheiro falhou. A versão transferida é diferente da original."
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Download / Pause"
-msgstr ""
+#: rapid/problemnotification.py:213
+msgid "The metadata might be corrupt."
+msgstr "Os metadados podem estar corrompidos."
 
-#: rapid/glade3/rapid.glade.h:51
-msgid "Download folder:"
+#: rapid/problemnotification.py:216
+msgid ""
+"The filename, extension and Exif information indicate it has already been "
+"downloaded."
 msgstr ""
+"O nome e extensão do ficheiro e informações Exif indicam que já foi "
+"transferido."
 
-#: rapid/glade3/rapid.glade.h:52
-msgid "Downloads today:"
-msgstr ""
+#: rapid/problemnotification.py:235
+#, python-format
+msgid " It was backed up to %(volume)s"
+msgstr " Foi feito backup para %(volume)s"
 
-#: rapid/glade3/rapid.glade.h:53
-msgid "Error Handling"
-msgstr ""
+#: rapid/problemnotification.py:237
+msgid " It was backed up to these devices: "
+msgstr " Foi feito backup destes dispositivos: "
 
-#: rapid/glade3/rapid.glade.h:54
-msgid "Error Log"
-msgstr ""
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
+#, python-format
+msgid "%s, "
+msgstr "%s, "
+
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
+#, python-format
+msgid "%(volumes)s and %(final_volume)s."
+msgstr "%(volumes)s e %(final_volume)s."
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Exit program if download completes without any warnings or errors"
+#: rapid/problemnotification.py:252
+#, python-format
+msgid ""
+"Photos detected with the same filenames, but taken at different times: "
+"%(details)s"
 msgstr ""
+"Fotos detectadas com o mesmo nome, mas tiradas em momentos diferentes: "
+"%(details)s"
+
+#: rapid/problemnotification.py:269
+#, python-format
+msgid "An error occurred when backing up on %(volume)s: %(inst)s."
+msgstr "Ocorreu um erro ao fazer backup em %(volume)s: %(inst)s."
+
+#: rapid/problemnotification.py:271
+#, python-format
+msgid "An error occurred when backing up on %(volume)s."
+msgstr "Ocorreu um erro ao fazer backup em %(volume)s."
 
-#: rapid/glade3/rapid.glade.h:56
-msgid "If you disable automatic detection, choose the exact backup location."
+#: rapid/problemnotification.py:273
+msgid "Errors occurred when backing up on the following backup devices: "
 msgstr ""
+"Ocorreram erros ao fazer backup nos dispositivos de backup seguintes: "
+
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
+#, python-format
+msgid "%(volume)s (%(inst)s), "
+msgstr "%(volume)s (%(inst)s), "
+
+#: rapid/problemnotification.py:279
+#, python-format
+msgid "%(volume)s, "
+msgstr "%(volume)s, "
+
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
+#, python-format
+msgid "%(volumes)s and %(volume)s (%(inst)s)."
+msgstr "%(volumes)s e %(volume)s (%(inst)s)."
+
+#: rapid/problemnotification.py:288
+#, python-format
+msgid "%(volumes)s and %(volume)s."
+msgstr "%(volumes)s e %(volume)s."
+
+#: rapid/problemnotification.py:296
+#, python-format
+msgid "Backup already exists on %(volume)s."
+msgstr "Um backup já existe no %(volume)s."
+
+#: rapid/problemnotification.py:298
+msgid "Backups already exist in these locations: "
+msgstr "Os backups já existem nestes locais: "
+
+#: rapid/problemnotification.py:308
+#, python-format
+msgid "Backup overwritten on %(volume)s."
+msgstr "Backup substituído em %(volume)s."
 
-#: rapid/glade3/rapid.glade.h:57
+#: rapid/problemnotification.py:310
+msgid "Backups overwritten on these devices: "
+msgstr "Backups substituídos nestes dispositivos: "
+
+#: rapid/problemnotification.py:321
+#, python-format
+msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
+msgstr "Ocorreu um erro ao criar diretórios em %(volume)s: %(inst)s."
+
+#: rapid/problemnotification.py:323
 msgid ""
-"If you disable automatic detection, choose the exact location of the images "
-"and videos."
+"Errors occurred when creating directories on the following backup devices: "
 msgstr ""
+"Ocorreram erros ao criar directórios nos dispositivos de backup seguintes: "
 
-#: rapid/glade3/rapid.glade.h:58
+#: rapid/problemnotification.py:335
+#, python-format
 msgid ""
-"If you enable automatic detection of Portable Storage Devices, the entire "
-"device will be scanned for images. On large devices, this could take some "
-"time."
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
 msgstr ""
+"A verificação de ficheiros falhou em %(volume)s. A versão guardada em backup "
+"é diferente da versão transferida."
 
-#: rapid/glade3/rapid.glade.h:59
-msgid "Import your photos and videos efficiently and reliably"
-msgstr ""
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr "A verificação de ficheiros falhou nestes dispositivos: "
 
-#: rapid/glade3/rapid.glade.h:60
-msgid "Job Codes"
-msgstr ""
+#: rapid/problemnotification.py:347
+#, python-format
+msgid "%(previousproblem)s Additionally, %(newproblem)s"
+msgstr "%(previousproblem)s Adicionalmente, %(newproblem)s"
 
-#: rapid/glade3/rapid.glade.h:61
-msgid "Location:"
-msgstr ""
+#: rapid/problemnotification.py:355
+#, python-format
+msgid " Furthermore, there were %(problems)s."
+msgstr " Além disso, houve %(problems)s."
 
-#: rapid/glade3/rapid.glade.h:62
-msgid "Overwrite"
-msgstr ""
+#: rapid/problemnotification.py:357
+#, python-format
+msgid " Furthermore, there was a %(problem)s."
+msgstr " Além disso, houve um %(problem)s."
 
-#: rapid/glade3/rapid.glade.h:63
-msgid "P_review Columns"
-msgstr ""
+#: rapid/problemnotification.py:366
+#, python-format
+msgid "The %(type)s metadata is missing."
+msgstr "Os metadados %(type)s estão em falta."
 
-#: rapid/glade3/rapid.glade.h:64
-msgid "Photo Folders"
-msgstr ""
+#: rapid/problemnotification.py:368
+msgid "The following metadata is missing: "
+msgstr "Os metadados seguinte estão em falta: "
 
-#: rapid/glade3/rapid.glade.h:65
-msgid "Photo Rename"
+#: rapid/problemnotification.py:371
+#, 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:388
+msgid "Problems in subfolder and filename generation"
+msgstr "Problemas na criação da subpasta e nome do ficheiro"
+
+#: rapid/problemnotification.py:390
+msgid "Problem in subfolder and filename generation"
+msgstr "Problema na criação da subpasta e nome do ficheiro"
+
+#: rapid/problemnotification.py:393
+#, python-format
+msgid "Problems in %s generation"
+msgstr "Problemas na criação de %s"
+
+#: rapid/problemnotification.py:395
+#, python-format
+msgid "Problem in %s generation"
+msgstr "Problema na criação de %s"
+
+#: rapid/problemnotification.py:404
+#, python-format
+msgid "%(filetype)s already exists, but it was backed up"
+msgstr "%(filetype)s já existe, mas foi feito backup"
+
+#: rapid/problemnotification.py:406
+#, python-format
+msgid "An error occurred when copying the %(filetype)s, but it was backed up"
+msgstr "Ocorreu um erro ao copiar %(filetype)s, mas foi feito backup"
+
+#: rapid/problemnotification.py:428
+msgid "Multiple problems were encountered"
+msgstr "Vários problemas foram encontrados"
+
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
+msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
+"Foram detectadas fotografias com o mesmo nome, mas com tempos diferentes"
 
-#: rapid/glade3/rapid.glade.h:66
-msgid "Photo backup folder name:"
+#: rapid/problemnotification.py:436
+msgid "there were errors backing up"
+msgstr "Ocorreram erros ao gazer o backup"
+
+#: rapid/problemnotification.py:437
+msgid "There were errors backing up"
+msgstr "Ocorreram erros ao fazer o backup"
+
+#: rapid/problemnotification.py:439
+msgid "there was an error backing up"
+msgstr "ocorreu um erro ao fazer backup"
+
+#: rapid/problemnotification.py:440
+msgid "There was an error backing up"
+msgstr "Ocorreu um erro ao fazer backup"
+
+#. e.g.
+#: rapid/problemnotification.py:443
+#, python-format
+msgid "%(previousproblem)s, and %(backinguperror)s"
+msgstr "%(previousproblem)s, e %(backinguperror)s"
+
+#: rapid/rpdfile.py:159
+#, python-format
+msgid "%(number)s %(filetypes)s"
+msgstr "%(number)s %(filetypes)s"
+
+#: rapid/rpdfile.py:169
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 msgstr ""
+"a analisar (encontradas %(photos)s fotografias e %(videos)s vídeos)..."
+
+#: rapid/subfolderfile.py:81
+#, python-format
+msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr "subdiretório e nome do ficheiro"
+
+#: rapid/subfolderfile.py:406
+msgid "Photo has already been downloaded"
+msgstr "A fotografia já foi transferida"
+
+#: rapid/subfolderfile.py:407
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Origem: %(source)s"
+
+#: rapid/subfolderfile.py:485
+msgid "Failed to create download subfolder"
+msgstr "Falha ao criar subpasta descarga"
+
+#: rapid/subfolderfile.py:486
+#, python-format
+msgid "Path: %s"
+msgstr "Caminho: %s"
+
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr "Sobre..."
+
+#: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
+msgstr "_Verificar Tudo"
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr "Verificar Todas as Fotografias"
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr "Verificar Todos os Vídeos"
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "Fazer uma _Doação..."
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr "_Obter Ajuda Online..."
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr "Ajuda"
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
+msgstr "Definições"
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
+msgstr "Sair"
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
+msgstr "Actualizar"
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr "_Reportar um Problema..."
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
+msgstr "Traduzir esta Aplicação..."
 
-#: rapid/glade3/rapid.glade.h:67
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr "_Desmarcar Tudo"
+
+#: rapid/glade3/rapid.ui.h:16
+msgid "_File"
+msgstr "_Ficheiro"
+
+#: rapid/glade3/rapid.ui.h:17
+msgid "Download / Pause"
+msgstr "Transferir / Pausar"
+
+#: rapid/glade3/rapid.ui.h:18
+msgid "_Select"
+msgstr "_Seleccionar"
+
+#: rapid/glade3/rapid.ui.h:19
+msgid "Select All Without _Job Code"
+msgstr "Selecionar Tudo Sem Código de Tarefa (_J)"
+
+#: rapid/glade3/rapid.ui.h:20
+msgid "Select All Wit_h Job Code"
+msgstr "Seleccionar com o Código de Tarefa (_H)"
+
+#: rapid/glade3/rapid.ui.h:21
+msgid "_View"
+msgstr "_Ver"
+
+#: rapid/glade3/rapid.ui.h:22
+msgid "_Error Log"
+msgstr "Registo de _Erros"
+
+#: rapid/glade3/rapid.ui.h:23
+msgid "_Clear Completed Downloads"
+msgstr "Limpar Tranferências _Concluídas"
+
+#: rapid/glade3/rapid.ui.h:24
+msgid "Previous File"
+msgstr "Ficheiro Anterior"
+
+#: rapid/glade3/rapid.ui.h:25
+msgid "Next File"
+msgstr "Ficheiro Seguinte"
+
+#: rapid/glade3/rapid.ui.h:26
+msgid "_Help"
+msgstr "Ajuda (_H)"
+
+#: rapid/glade3/rapid.ui.h:27
+msgid "_Translate this Application..."
+msgstr "_Traduzir esta Aplicação..."
+
+#: rapid/glade3/rapid.ui.h:28
+msgid "_Include in download"
+msgstr "_Incluir na transferência"
+
+#: rapid/glade3/rapid.ui.h:29
+msgid "_Download"
+msgstr "Transferência (_D)"
+
+#: rapid/glade3/prefs.ui.h:1
 msgid "Preferences: Rapid Photo Downloader"
-msgstr ""
+msgstr "Definições: Rapid Photo Downloader"
 
-#: rapid/glade3/rapid.glade.h:68
-msgid "Preview _Folders"
+#: rapid/glade3/prefs.ui.h:2
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
 msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Pasta de Transferência de Fotos</span>"
 
-#: rapid/glade3/rapid.glade.h:70
-msgid "R_emove All"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:3
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr "<i>Exemplo: /home/utilizador/Imagens</i>"
 
-#: rapid/glade3/rapid.glade.h:72
+#: rapid/glade3/prefs.ui.h:4
+msgid "<b>Download Subfolders</b>"
+msgstr "<b>Subpastas de Transferência</b>"
+
+#: rapid/glade3/prefs.ui.h:5
+msgid "Download folder:"
+msgstr "Pasta de transferências:"
+
+#: rapid/glade3/prefs.ui.h:6
 msgid ""
-"Rapid Photo Downloader is free software; you can redistribute it and/or "
-"modify it under the terms of the GNU General Public License as published by "
-"the Free Software Foundation; either version 2 of the License, or (at your "
-"option) any later version.\n"
-"\n"
-"Rapid Photo Downloader is distributed in the hope that it will be useful, "
-"but WITHOUT ANY WARRANTY; without even the implied warranty of "
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
-"Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"Rapid Photo Downloader; if not, write to the Free Software Foundation, Inc., "
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"Choose the download folder. Subfolders for the downloaded photos will be "
+"automatically created in this folder using the structure specified below."
 msgstr ""
+"Escolher pasta de transferência. Subpastas para as fotos serão criados "
+"automaticamente nesta pasta usando a estrutura especificada em seguida."
 
-#: rapid/glade3/rapid.glade.h:77
-msgid "Rename Options"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:7
+msgid "<b>Download Folder</b>"
+msgstr "<b>Pasta de Transferência</b>"
 
-#: rapid/glade3/rapid.glade.h:78
-msgid "Se_lect None"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:8
+msgid "Photo Folders"
+msgstr "Pastas de Fotografias"
 
-#: rapid/glade3/rapid.glade.h:79
-msgid "Select All Pho_tos"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:9
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Renomear Fotografia</span>\t"
 
-#: rapid/glade3/rapid.glade.h:80
-msgid "Select All Vi_deos"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:10
+msgid "<b>Photo Rename</b>"
+msgstr "<b>Renomear Fotografia</b>"
 
-#: rapid/glade3/rapid.glade.h:81
-msgid "Select All Wit_h Job Code"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:11
+msgid " "
+msgstr " "
 
-#: rapid/glade3/rapid.glade.h:82
-msgid "Select All Without _Job Code"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:12
+msgid "<i>New:</i>"
+msgstr "<i>Novo:</i>"
 
-#: rapid/glade3/rapid.glade.h:83
-msgid "Select _All"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:13
+msgid "<i>Original:</i>"
+msgstr "<i>Original:</i>"
 
-#: rapid/glade3/rapid.glade.h:84
-msgid "Skip"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:14
+msgid "<b>Example</b>"
+msgstr "<b>Exemplo</b>"
 
-#: rapid/glade3/rapid.glade.h:85
-msgid "Skip download"
+#: rapid/glade3/prefs.ui.h:15
+msgid "Photo Rename"
+msgstr "Renomear Fotografia"
+
+#: rapid/glade3/prefs.ui.h:16
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
 msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Pasta de Transferência de "
+"Vídeos</span>"
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/prefs.ui.h:17
 msgid ""
 "Sorry, video downloading functionality disabled. To download videos, please "
-"install the <i>kaa metadata</i> package for python."
+"install either the <i>hachoir metadata</i> and <i>kaa metadata</i> packages "
+"for python, or <i>exiftool</i>."
 msgstr ""
+"Desculpe, a funcionalidade de transferência de vídeo foi desactivada Para "
+"executar a transferência de vídeos, por favor instale os pacotes <i>hachoir "
+"metadata</i> e <i>kaa metadata</i> do python, ou <i>exiftool</i>."
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/prefs.ui.h:18
 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>"
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
 msgstr ""
+"Escolher pasta de transferência. Subpastas para os vídeos transferidos serão "
+"criadas automaticamente nesta pasta usando a estrutura especificada em "
+"seguida."
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/prefs.ui.h:19
+msgid "Video Folders"
+msgstr "Pasta de Vídeo"
+
+#: rapid/glade3/prefs.ui.h:20
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Renomear Vídeos</span>\t"
+
+#: rapid/glade3/prefs.ui.h:21
+msgid "Video Rename"
+msgstr "Renomear Vídeo"
+
+#: rapid/glade3/prefs.ui.h:22
+msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Renomear Opções</span>"
+
+#: rapid/glade3/prefs.ui.h:23
+msgid "<b>Sequence Numbers</b>"
+msgstr "<b>Números de sequência</b>"
+
+#: rapid/glade3/prefs.ui.h:24
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
 msgstr ""
+"Especifique o tempo no formato de 24 horas no qual a sequência numérica de  "
+"<i>Transferência de Hoje</i> devem reiniciar."
+
+#: rapid/glade3/prefs.ui.h:25
+msgid "Day start:"
+msgstr "Dia de início:"
+
+#: rapid/glade3/prefs.ui.h:26
+msgid "Downloads today:"
+msgstr "Transferências de hoje:"
+
+#: rapid/glade3/prefs.ui.h:27
+msgid "Stored number:"
+msgstr "Número acumulado:"
+
+#: rapid/glade3/prefs.ui.h:28
+msgid ":"
+msgstr ":"
+
+#: rapid/glade3/prefs.ui.h:29
+msgid " hh:mm"
+msgstr " hh:mm"
+
+#: rapid/glade3/prefs.ui.h:30
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "Sincronizar números de sequência RAW+JPEG"
+
+#: rapid/glade3/prefs.ui.h:31
+msgid "<b>Compatibility with Other Operating Systems</b>"
+msgstr "<b>Compatibilidade com Outros Sistemas Operativos</b>"
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/prefs.ui.h:32
 msgid ""
 "Specify whether photo, video and folder names should have any characters "
 "removed that are not allowed by other operating systems."
 msgstr ""
+"Escolha se um caractere do nome de uma fotografia, vídeo ou directório deve "
+"ser omitido, para o caso do mesmo não ser suportado por outros sistemas "
+"operativos."
 
-#: rapid/glade3/rapid.glade.h:92
-msgid "Start downloading at program startup"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:33
+msgid "Strip incompatible characters"
+msgstr "Omitir caracteres incompatíveis"
 
-#: rapid/glade3/rapid.glade.h:93
-msgid "Start downloading upon device insertion"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:34
+msgid "Rename Options"
+msgstr "Renomear Opções"
 
-#: rapid/glade3/rapid.glade.h:94
-msgid "Stored number:"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:35
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Códigos de Tarefa</span>"
 
-#: rapid/glade3/rapid.glade.h:95
-msgid "Strip incompatible characters"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:36
+msgid "<b>Job Codes</b>"
+msgstr "<b>Códigos de Tarefa</b>"
 
-#: rapid/glade3/rapid.glade.h:96
-msgid "Synchronize RAW + JPEG sequence numbers"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:37
+msgid "_Add..."
+msgstr "_Adicionar..."
 
-#: rapid/glade3/rapid.glade.h:97
-msgid "Unmount (\"eject\") device upon download completion"
+#: rapid/glade3/prefs.ui.h:39
+msgid "R_emove All"
+msgstr "R_emover Tudo"
+
+#: rapid/glade3/prefs.ui.h:40
+msgid "Job Codes"
+msgstr "Códigos de Tarefa"
+
+#: rapid/glade3/prefs.ui.h:41
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Dispositivos</span>"
+
+#: rapid/glade3/prefs.ui.h:42
+msgid "Devices"
+msgstr "Dispositivos"
+
+#: 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"
+"\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\n"
+"\n"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
 msgstr ""
+"Dispositivos são de onde as fotos e vídeos são transferidas, tais como "
+"câmaras, cartões de memória ou dispositivos de armazenamento portátil.\n"
+"\n"
+"Pode transferir de vários dispositivos simultaneamente, ou pode especificar "
+"um local em seu disco rígido.\n"
+"\n"
+"<i>Transferir directamente de câmaras é actualmente um recurso experimental. "
+"Caso ele não funcione correctamente, tente activar o modo PTP. Caso isso não "
+"seja possível, um leitor de cartões deve ser utilizado.</i>"
 
-#: rapid/glade3/rapid.glade.h:98
-msgid "Video Folders"
+#: rapid/glade3/prefs.ui.h:48
+msgid "Automatically detect Portable Storage Devices"
+msgstr "Detectar automaticamente Dispositivos de Armazenamento Portátil"
+
+#: rapid/glade3/prefs.ui.h:49
+msgid "Automatically detect devices"
+msgstr "Detectar automaticamente dispositivos"
+
+#: rapid/glade3/prefs.ui.h:50
+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 ""
+"Se activar a detecção de Dispositivos de Armazenamento Portáteis, todo o "
+"dispositivo será analisado. Em dispositivos muito grandes, isso pode levar "
+"algum tempo.\n"
+"Quando esta opção esta activada e um potencial dispositivo é detectado, será "
+"perguntado se o mesmo deve ser analisado ou não."
 
-#: rapid/glade3/rapid.glade.h:99
-msgid "Video Rename"
+#: rapid/glade3/prefs.ui.h:53
+msgid "Location:"
+msgstr "Localização:"
+
+#: rapid/glade3/prefs.ui.h:54
+msgid ""
+"If you disable automatic detection, choose the exact location of the photos "
+"and videos."
 msgstr ""
+"Se desactivar a detecção automática, escolha o local exacto das fotografias "
+"e vídeos."
 
-#: rapid/glade3/rapid.glade.h:100
-msgid "Video backup folder name:"
+#: rapid/glade3/prefs.ui.h:55
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Opções do Dispositivo</span>"
+
+#: rapid/glade3/prefs.ui.h:56
+msgid "Remembered Paths"
+msgstr "Caminhos Recordados"
+
+#: rapid/glade3/prefs.ui.h:57
+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 ""
+"Caminhos recordados são os que estão associados com dispositivos que "
+"escolheu analisar sempre ou ignorar quando a detecção automatica de "
+"dispositivos está activada."
+
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths"
+msgstr "Caminhos Ignorados"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/prefs.ui.h:59
 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."
+"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 ""
+"Especifique a porção final de qualquer caminho que queira ignorado quando a "
+"analisar de dispositivos à procura de fotografias ou vídeos. Qualquer "
+"caminho que termine nos valores abaixo referidos não será analisado."
+
+#: rapid/glade3/prefs.ui.h:61
+msgid "Re_move All"
+msgstr "Re_mover Todas"
+
+#: rapid/glade3/prefs.ui.h:62
+msgid "Use _python-style regular expressions"
+msgstr "Usar expressões regulares no estilo _python"
+
+#: rapid/glade3/prefs.ui.h:63
+msgid "Device Options"
+msgstr "Opções do Dispositivo"
+
+#: rapid/glade3/prefs.ui.h:64
+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 "<b>Backup</b>"
+msgstr "<b>Backup</b>"
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/prefs.ui.h:66
 msgid ""
-"When backing up, choose whether to overwrite a file on the backup device "
-"that has the same name, or skip backing it up."
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
+"Se desactivar a detecção automática, seleccione o caminho exacto do local do "
+"backup."
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/prefs.ui.h:67
+msgid "Automatically detect backup devices"
+msgstr "Detectar automaticamente dispositivos de backup"
+
+#: rapid/glade3/prefs.ui.h:68
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
+"Ao descarregar fotografias e vídeos, há a possibilidade de que seja feita "
+"uma cópia de segurança em vários locais diferentes, como, por exemplo, em "
+"discos rígidos externos."
 
-#: rapid/glade3/rapid.glade.h:104
-msgid "_Add..."
-msgstr ""
+#: rapid/glade3/prefs.ui.h:69
+msgid "Back up photos and videos when downloading"
+msgstr "Fazer backup de fotografias e vídeos ao transferir"
 
-#: rapid/glade3/rapid.glade.h:105
-msgid "_Clear Completed Downloads"
+#: 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 ""
+"Especifique a pasta no qual os backups serão armazenados no dispositivo.  \n"
+"\n"
+"<i>Nota: isso também será utilizado para determinar se o dispositivo é ou "
+"não utilizado para backups. Para cada dispositivo que deseja usar para fazer "
+"backup, criar uma pasta com um desses nomes.</i>"
 
-#: rapid/glade3/rapid.glade.h:106
-msgid "_Device"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:73
+msgid "Photo backup location:"
+msgstr "Local do backup de fotografias:"
 
-#: rapid/glade3/rapid.glade.h:107
-msgid "_Error Log"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:74
+msgid "Photo backup folder name:"
+msgstr "Nome da Pasta de Backup de Fotografias"
 
-#: rapid/glade3/rapid.glade.h:108
-msgid "_File"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:75
+msgid "<i>Example:</i>"
+msgstr "<i>Exemplo:</i>"
 
-#: rapid/glade3/rapid.glade.h:109
-msgid "_Filename"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:76
+msgid "<i>/media/externaldrive/Photos</i>"
+msgstr "<i>/media/discoexterno/Fotos</i>"
 
-#: rapid/glade3/rapid.glade.h:110
-msgid "_Get Help Online..."
-msgstr ""
+#: rapid/glade3/prefs.ui.h:77
+msgid "Video backup folder name:"
+msgstr "Nome da pasta para cópia de segurança de vídeos:"
 
-#: rapid/glade3/rapid.glade.h:111
-msgid "_Help"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:78
+msgid "Video backup location:"
+msgstr "Local do backup de Vídeos:"
 
-#: rapid/glade3/rapid.glade.h:112
-msgid "_Make a Donation..."
-msgstr ""
+#: rapid/glade3/prefs.ui.h:79
+msgid "Back up"
+msgstr "Backup"
 
-#: rapid/glade3/rapid.glade.h:113
-msgid "_Path"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:80
+msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Diversos</span>"
 
-#: rapid/glade3/rapid.glade.h:114
-msgid "_Preview"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:81
+msgid "<b>Program Automation</b>"
+msgstr "<b>Programa de Automação</b>"
 
-#: rapid/glade3/rapid.glade.h:115
-msgid "_Report a Problem..."
+#: rapid/glade3/prefs.ui.h:82
+msgid "Unmount (\"eject\") device upon download completion"
 msgstr ""
+"Desmontar ou ejetar o dispositivo após a conclusão da tarefa de transferência"
 
-#: rapid/glade3/rapid.glade.h:116
-msgid "_Select"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:83
+msgid "Start downloading at program startup"
+msgstr "Iniciar a transferência após o início do programa"
 
-#: rapid/glade3/rapid.glade.h:117
-msgid "_Size"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:84
+msgid "Start downloading upon device insertion"
+msgstr "Iniciar a transferência ao conectar o dispositivo"
 
-#: rapid/glade3/rapid.glade.h:118
-msgid "_Translate this Application..."
-msgstr ""
+#: rapid/glade3/prefs.ui.h:85
+msgid "Exit program when download completes"
+msgstr "Sair do programa quando a transferência terminar"
+
+#: rapid/glade3/prefs.ui.h:86
+msgid "Exit program even if download had warnings or errors"
+msgstr "Sair do programa mesmo que o download tivesse avisos ou erros"
+
+#: rapid/glade3/prefs.ui.h:87
+msgid "Automatically rotate JPEG images"
+msgstr "Rodar imagens JPEG automaticamente"
 
-#: rapid/glade3/rapid.glade.h:119
-msgid "_Type"
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr "Verificar os ficheiros assim que são transferidos"
+
+#: rapid/glade3/prefs.ui.h:90
+msgid "Performance"
+msgstr "Perfomance"
+
+#: rapid/glade3/prefs.ui.h:91
+msgid "Generate thumbnails (slower)"
+msgstr "Criar miniaturas (mais lento)"
+
+#: rapid/glade3/prefs.ui.h:92
+msgid "Miscellaneous"
+msgstr "Vários"
+
+#: rapid/glade3/prefs.ui.h:93
+msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Gestão de Erros</span>"
+
+#: rapid/glade3/prefs.ui.h:94
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr "<b>Conflitos de Nomes de Fotos e Vídeos</b>"
+
+#: rapid/glade3/prefs.ui.h:95
+msgid "Add unique identifier"
+msgstr "Adicionar um identificador único"
+
+#: rapid/glade3/prefs.ui.h:96
+msgid "Skip download"
+msgstr "Ignorar transferência"
+
+#: rapid/glade3/prefs.ui.h:97
+msgid ""
+"When a photo or video of the same name has already been downloaded, choose "
+"whether to skip downloading the file, or to add a unique indentifier."
 msgstr ""
+"Escolha como o programa deverá proceder caso ao copiar uma fotografia ou "
+"vídeo haja um arquivo de mesmo nome."
 
-#: rapid/glade3/rapid.glade.h:120
-msgid "_View"
+#: rapid/glade3/prefs.ui.h:98
+msgid ""
+"When backing up, choose whether to overwrite a file on the backup device "
+"that has the same name, or skip backing it up."
 msgstr ""
+"Escolha como o programa deverá proceder caso ao fazer uma cópia de segurança "
+"haja um arquivo de mesmo nome."
+
+#: rapid/glade3/prefs.ui.h:99
+msgid "Overwrite"
+msgstr "Sobrescrever"
+
+#: rapid/glade3/prefs.ui.h:100
+msgid "Skip"
+msgstr "Ignorar"
+
+#: rapid/glade3/prefs.ui.h:101
+msgid "Error Handling"
+msgstr "Gestão de Erros"
+
+#: rapid/glade3/about.ui.h:1
+msgid "Import your photos and videos efficiently and reliably"
+msgstr "Importar fotografias e vídeos de forma eficiente e confiável"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7fda44b..bcec327 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-01-30 14:43-0600\n"
-"PO-Revision-Date: 2012-04-10 12:45+0000\n"
-"Last-Translator: Aluísio Augusto Silva Gonçalves <Unknown>\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:16+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-14 01:41+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\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:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:114
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:116
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:119
+#: rapid/rapid.py:127
 #, 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:162
 msgid "Device"
 msgstr "Dispositivo"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:172
+#: rapid/rapid.py:180
 msgid "Size"
 msgstr "Tamanho"
 
-#: rapid/rapid.py:175
+#: rapid/rapid.py:183
 msgid "Download Progress"
 msgstr "Progresso da transferência"
 
-#: rapid/rapid.py:321
+#: rapid/rapid.py:343
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s não desmontado"
@@ -66,22 +66,22 @@ msgstr "%(device)s não desmontado"
 #. looking for photos or videos. It is visible initially in the progress bar for each device
 #. (which normally holds "x photos and videos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1188
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr "verificando..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1751
+#: rapid/rapid.py:1818
 msgid "the root of the file system"
 msgstr "a raiz do sistema de arquivos"
 
 #. 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:1822
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Tranferindo de %(location)s."
 
-#: rapid/rapid.py:1756
+#: rapid/rapid.py:1823
 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 ""
 "Você realmente deseja realizar o download deste local? Em alguns sistemas, "
 "varrer este local pode leavar muito tempo."
 
-#: rapid/rapid.py:2178
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr "Download"
 
-#: rapid/rapid.py:2181
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr "Pausar"
 
-#: rapid/rapid.py:2286
+#: rapid/rapid.py:2376
 #, 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:2379
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -117,176 +117,187 @@ msgstr ""
 "Essa pasta de download é inválida:\n"
 "%s"
 
-#: rapid/rapid.py:2290
+#: rapid/rapid.py:2380
 msgid "Download cannot proceed"
 msgstr "A transferência não pôde continuar"
 
-#: rapid/rapid.py:2657
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "fotos"
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "vídeos"
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr ""
+
+#: rapid/rapid.py:2802
 msgid "About 1 second remaining"
 msgstr "Faltando 1 segundo aproximadamente"
 
-#: rapid/rapid.py:2659
+#: rapid/rapid.py:2804
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Faltando %i segundos aproximadamente"
 
-#: rapid/rapid.py:2661
+#: rapid/rapid.py:2806
 msgid "About 1 minute remaining"
 msgstr "Faltando 1 minuto aproximadamente"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:2666
+#: rapid/rapid.py:2811
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Faltando %(minutes)i:%(seconds)02i minutos aproximadamente"
 
-#: rapid/rapid.py:2688 rapid/rpdfile.py:115
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
 msgid "photos and videos"
 msgstr "fotos e vídeos"
 
-#: rapid/rapid.py:2690 rapid/rpdfile.py:117
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
 msgid "photos or videos"
 msgstr "fotos ou vídeos"
 
-#: rapid/rapid.py:2693 rapid/rapid.py:3506 rapid/rpdfile.py:120
-msgid "videos"
-msgstr "vídeos"
-
-#: rapid/rapid.py:2695 rapid/preferencesdialog.py:1617 rapid/rpdfile.py:122
-#: rapid/rpdfile.py:271
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
 msgid "video"
 msgstr "vídeo"
 
-#: rapid/rapid.py:2698 rapid/rapid.py:3504 rapid/rpdfile.py:125
-msgid "photos"
-msgstr "fotos"
-
 #. 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:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
 msgid "photo"
 msgstr "foto"
 
-#: rapid/rapid.py:2727
+#: rapid/rapid.py:2872
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s descarregados"
 
-#: rapid/rapid.py:2731
+#: rapid/rapid.py:2876
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s não puderam ser descarregados"
 
-#: rapid/rapid.py:2734 rapid/rapid.py:2786
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
 msgid "warnings"
 msgstr "avisos"
 
-#: rapid/rapid.py:2743
+#: rapid/rapid.py:2892
 msgid "All downloads complete"
 msgstr "Todos os downloads completos"
 
-#: rapid/rapid.py:2749 rapid/rapid.py:2758 rapid/rapid.py:2767
-#: rapid/rapid.py:2776 rapid/rapid.py:2784
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2751 rapid/rapid.py:2769
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s downloaded"
 
-#: rapid/rapid.py:2760 rapid/rapid.py:2778
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s falhou em baixar"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2817
+#: rapid/rapid.py:2970
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr "%(number)s de %(total)s %(filetypes)s (%(remaining)s restantes)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2824
+#: rapid/rapid.py:2977
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s de %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3170
+#: rapid/rapid.py:3331
 msgid "From"
 msgstr "De"
 
-#: rapid/rapid.py:3178
+#: rapid/rapid.py:3339
 msgid "Auto Detect"
 msgstr "Detectar Automaticamente"
 
-#: rapid/rapid.py:3182 rapid/preferencesdialog.py:1324
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Escolha um diretório que contenha %(file_types)s"
 
-#: rapid/rapid.py:3223
+#: rapid/rapid.py:3384
 msgid "Copy"
 msgstr "Copiar"
 
-#: rapid/rapid.py:3236
+#: rapid/rapid.py:3397
 msgid "Move"
 msgstr "Mover"
 
-#: rapid/rapid.py:3258
+#: rapid/rapid.py:3419
 msgid "To"
 msgstr "Para"
 
-#: rapid/rapid.py:3265 rapid/rapid.py:3901
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
 msgid "Photos:"
 msgstr "Fotos:"
 
-#: rapid/rapid.py:3268 rapid/preferencesdialog.py:1161
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
 msgid "Select a folder to download photos to"
 msgstr "Selecione o diretório para baixar as fotos para"
 
-#: rapid/rapid.py:3280 rapid/rapid.py:3901
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
 msgid "Videos:"
 msgstr "Vídeos:"
 
-#: rapid/rapid.py:3282 rapid/preferencesdialog.py:1179
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
 msgid "Select a folder to download videos to"
 msgstr "Selecione o diretório para baixar os vídeos para"
 
-#: rapid/rapid.py:3474
+#: rapid/rapid.py:3650
 msgid "and"
 msgstr "e"
 
-#: rapid/rapid.py:3479
+#: rapid/rapid.py:3655
 msgid "Using backup devices"
 msgstr "Usando dispositivos de backup"
 
-#: rapid/rapid.py:3481
+#: rapid/rapid.py:3657
 msgid "Using backup device"
 msgstr "Usando o dispositivo de backup"
 
-#: rapid/rapid.py:3483
+#: rapid/rapid.py:3659
 msgid "No backup devices detected"
 msgstr "Nenhum dispositivo de backup detectado"
 
-#: rapid/rapid.py:3510
+#: rapid/rapid.py:3686
 msgid "Free space:"
 msgstr "Espaço livre:"
 
 #. (videos) or (photos) will be appended to the free space message displayed to the
 #. user in the status bar.
 #. you should only translate this if your language does not use parantheses
-#: rapid/rapid.py:3522
+#: rapid/rapid.py:3698
 #, 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:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -294,87 +305,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:3707
 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:3712
 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:3718
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s livres"
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3550
+#: rapid/rapid.py:3726
 #, python-format
 msgid "Backing up photos and videos to %(path)s"
 msgstr "Criando o backup das fotos e vídeos em %(path)s"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3553
+#: rapid/rapid.py:3729
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "A criar cópias de segurança em %(path)s"
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3556
+#: rapid/rapid.py:3732
 #, python-format
 msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr "Criando o backup das fotos em %(path)s e vídeos em %(path2)s"
 
-#: rapid/rapid.py:3563
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3592
+#: rapid/rapid.py:3768
 msgid "Program preferences are invalid"
 msgstr "Preferências do programa são inválidas"
 
-#: rapid/rapid.py:3711 rapid/rpdfile.py:253
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
 msgid "Photo"
 msgstr "Fotografia"
 
-#: rapid/rapid.py:3713 rapid/rpdfile.py:272
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "Vídeo"
 
-#: rapid/rapid.py:3722
+#: rapid/rapid.py:3921
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s pasta de download não existe"
 
-#: rapid/rapid.py:3724 rapid/rapid.py:3738 rapid/rapid.py:3751
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
 msgid "Folder: %s"
 msgstr "Pasta: %s"
 
-#: rapid/rapid.py:3736
+#: rapid/rapid.py:3935
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s pasta de download e inválida"
 
-#: rapid/rapid.py:3749
+#: rapid/rapid.py:3948
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s pasta de download não é gravável"
 
-#: rapid/rapid.py:3835
+#: rapid/rapid.py:4034
 msgid "Thumbnails"
 msgstr "Miniaturas"
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3882
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -383,45 +394,64 @@ msgstr ""
 "exibir informaçṍes do programa na linha de comando enquando o programa é "
 "executado (default: %default)"
 
-#: rapid/rapid.py:3883
+#: rapid/rapid.py:4090
 msgid "display debugging information when run from the command line"
 msgstr ""
 "mostrar informações de depuração quando executado a partir da linha de "
 "comando"
 
-#: rapid/rapid.py:3884
+#: rapid/rapid.py:4091
 msgid "only output errors to the command line"
 msgstr "Ouvir apenas os erros de saída para a linha de comando"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3886
+#: rapid/rapid.py:4093
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr "Listar extensões de foto vídeo que o  programa reconhece e sair"
 
-#: rapid/rapid.py:3888
+#: rapid/rapid.py:4095
+msgid ""
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
+msgstr ""
+
+#: rapid/rapid.py:4096
+msgid ""
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
+msgstr ""
+
+#: rapid/rapid.py:4097
 msgid "reset all program settings and preferences and exit"
 msgstr ""
 "Restabelecer todas as configurações e preferências do programa e fechá-lo"
 
-#: rapid/rapid.py:3906
+#: rapid/rapid.py:4110
+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:4133
 #, python-format
 msgid "and %s"
 msgstr "e %s"
 
-#: rapid/rapid.py:3914
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
 msgstr "Todas as configurações e preferências foram redefinidas"
 
-#: rapid/backupfile.py:156 rapid/backupfile.py:179
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
 msgid "Backing up error"
 msgstr "Erro ao criar cópias de segurança"
 
-#: rapid/backupfile.py:158
+#: rapid/backupfile.py:151
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Diretório de destino não pôde ser criado: %(directory)s\n"
 
-#: rapid/backupfile.py:160 rapid/backupfile.py:181 rapid/subfolderfile.py:198
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -430,13 +460,29 @@ msgstr ""
 "Origem: %(source)s\n"
 "Destino: %(destination)s"
 
-#: rapid/backupfile.py:163 rapid/backupfile.py:183
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Erro: %(inst)s"
 
-#: rapid/copyfiles.py:162 rapid/subfolderfile.py:213
-#: rapid/subfolderfile.py:346 rapid/subfolderfile.py:364
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -445,12 +491,16 @@ msgstr ""
 "%(problem)s\n"
 "Arquivo: %(file)s"
 
-#: rapid/device.py:79
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr ""
+
+#: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Dispositivo detectado"
 
 #. 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 ""
@@ -458,483 +508,493 @@ msgstr ""
 "dispositivo ou partição?"
 
 #. 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 "_Relembrar esta escolha"
 
-#: 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 hora"
 
-#: rapid/generatenameconfig.py:151
+#: rapid/generatenameconfig.py:152
 msgid "Text"
 msgstr "Texto"
 
-#: rapid/generatenameconfig.py:152
+#: rapid/generatenameconfig.py:153
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: rapid/generatenameconfig.py:153
+#: rapid/generatenameconfig.py:154
 msgid "Metadata"
 msgstr "Metadados"
 
-#: rapid/generatenameconfig.py:154
+#: rapid/generatenameconfig.py:155
 msgid "Sequences"
 msgstr "Seqüências"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/generatenameconfig.py:156 rapid/preferencesdialog.py:574
+#: rapid/generatenameconfig.py:157 rapid/preferencesdialog.py:577
 msgid "Job code"
 msgstr "Etiqueta"
 
-#: rapid/generatenameconfig.py:157
+#: rapid/generatenameconfig.py:158
 msgid "Image date"
 msgstr "Imagem de dados"
 
-#: rapid/generatenameconfig.py:158
+#: rapid/generatenameconfig.py:159
 msgid "Video date"
 msgstr "Dados de vídeo"
 
-#: rapid/generatenameconfig.py:159
+#: rapid/generatenameconfig.py:160
 msgid "Today"
 msgstr "Hoje"
 
-#: rapid/generatenameconfig.py:160
+#: rapid/generatenameconfig.py:161
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/generatenameconfig.py:162
+#: rapid/generatenameconfig.py:163
 msgid "Download time"
 msgstr "Início do download"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:164
+#: rapid/generatenameconfig.py:165
 msgid "Name + extension"
 msgstr "Nome + extensão"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py: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 "Extensão"
 
 #. 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 "Número da imagem"
 
-#: rapid/generatenameconfig.py:171
+#: rapid/generatenameconfig.py:172
 msgid "Video number"
 msgstr "Número do vídeo"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:173
+#: rapid/generatenameconfig.py:174
 msgid "Aperture"
 msgstr "Abertura"
 
 #. 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 de exposição"
 
 #. 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 "Distância focal"
 
 #. 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 "Filmar"
 
 #. 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 "Modelo da câmera"
 
 #. 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 "Modelo de câmera Curta"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:187
+#: rapid/generatenameconfig.py:188
 msgid "Hyphenated short camera model"
 msgstr "Modelo hifenizada de câmera de curto"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:189
+#: rapid/generatenameconfig.py:190
 msgid "Serial number"
 msgstr "Número de série"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:191
+#: rapid/generatenameconfig.py:192
 msgid "Shutter count"
 msgstr "Contagem de Disparos"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: rapid/generatenameconfig.py:193
+#: rapid/generatenameconfig.py:194
 msgid "File number"
 msgstr "Numero do arquivo"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: rapid/generatenameconfig.py:195
+#: rapid/generatenameconfig.py:196
 msgid "Folder only"
 msgstr "Apenas pasta"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: rapid/generatenameconfig.py:197
+#: rapid/generatenameconfig.py:198
 msgid "Folder and file"
 msgstr "Pasta e arquivo"
 
 #. 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 do dono"
 
-#: rapid/generatenameconfig.py:200
+#: rapid/generatenameconfig.py:201
 msgid "Codec"
 msgstr "Codec"
 
-#: rapid/generatenameconfig.py:201
+#: rapid/generatenameconfig.py:202
 msgid "Width"
 msgstr "Largura"
 
-#: rapid/generatenameconfig.py:202
+#: rapid/generatenameconfig.py:203
 msgid "Height"
 msgstr "Altura"
 
-#: rapid/generatenameconfig.py:203
+#: rapid/generatenameconfig.py:204
 msgid "Length"
 msgstr "Comprimento"
 
-#: rapid/generatenameconfig.py:204
+#: rapid/generatenameconfig.py:205
 msgid "Frames Per Second"
 msgstr "Quadros Por Segundo"
 
-#: rapid/generatenameconfig.py:205
+#: rapid/generatenameconfig.py:206
 msgid "Artist"
 msgstr "Artista"
 
-#: rapid/generatenameconfig.py:206
+#: rapid/generatenameconfig.py:207
 msgid "Copyright"
 msgstr "Direitos autorais"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:208
+#: rapid/generatenameconfig.py:209
 msgid "Downloads today"
 msgstr "Downloads de hoje"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:210
+#: rapid/generatenameconfig.py:211
 msgid "Session number"
 msgstr "Número da sessão"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:212
+#: rapid/generatenameconfig.py:213
 msgid "Subfolder number"
 msgstr "Número da subpasta"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:214
+#: rapid/generatenameconfig.py:215
 msgid "Stored number"
 msgstr "Número armazenado"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/generatenameconfig.py:216
+#: rapid/generatenameconfig.py:217
 msgid "Sequence letter"
 msgstr "Seqüência de letras"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:218
+#: rapid/generatenameconfig.py:219
 msgid "All digits"
 msgstr "Todos os dígitos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:220
+#: rapid/generatenameconfig.py:221
 msgid "Last digit"
 msgstr "Último dígito"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:222
+#: rapid/generatenameconfig.py:223
 msgid "Last 2 digits"
 msgstr "Últimos 2 dígitos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:224
+#: rapid/generatenameconfig.py:225
 msgid "Last 3 digits"
 msgstr "Últimos 3 dígitos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:226
+#: rapid/generatenameconfig.py:227
 msgid "Last 4 digits"
 msgstr "Últimos 4 dígitos"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:228
+#: rapid/generatenameconfig.py:229
 msgid "Original Case"
 msgstr "Caixa de tetxo original"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:230
+#: rapid/generatenameconfig.py:231
 msgid "UPPERCASE"
 msgstr "CAIXA ALTA"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:232
+#: rapid/generatenameconfig.py:233
 msgid "lowercase"
 msgstr "caixa baixa"
 
-#: rapid/generatenameconfig.py:233
+#: rapid/generatenameconfig.py:234
 msgid "One digit"
 msgstr "Um dígito"
 
-#: rapid/generatenameconfig.py:234
+#: rapid/generatenameconfig.py:235
 msgid "Two digits"
 msgstr "Dois dígitos"
 
-#: rapid/generatenameconfig.py:235
+#: rapid/generatenameconfig.py:236
 msgid "Three digits"
 msgstr "Três dígitos"
 
-#: rapid/generatenameconfig.py:236
+#: rapid/generatenameconfig.py:237
 msgid "Four digits"
 msgstr "Quatro dígitos"
 
-#: rapid/generatenameconfig.py:237
+#: rapid/generatenameconfig.py:238
 msgid "Five digits"
 msgstr "Cinco dígitos"
 
-#: rapid/generatenameconfig.py:238
+#: rapid/generatenameconfig.py:239
 msgid "Six digits"
 msgstr "Seis dígitos"
 
-#: rapid/generatenameconfig.py:239
+#: rapid/generatenameconfig.py:240
 msgid "Seven digits"
 msgstr "Sete dígitos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:241
+#: rapid/generatenameconfig.py:242
 msgid "Subseconds"
 msgstr "Subsegundos"
 
 #. 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-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 "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 ""
+
+#. 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 "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 (minutos)"
 
 #. 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 "Preferências de subpasta não deve começar com uma %s"
 
-#: rapid/preferencesdialog.py:373
+#: rapid/preferencesdialog.py:376
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Preferências subpasta não deve terminar com uma %s"
 
-#: rapid/preferencesdialog.py:377
+#: rapid/preferencesdialog.py:380
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Preferências subpasta não deve conter dois %s um após o outro"
 
-#: rapid/preferencesdialog.py:436 rapid/preferencesdialog.py:697
+#: rapid/preferencesdialog.py:439 rapid/preferencesdialog.py:700
 msgid "Remove all Job Codes?"
 msgstr "Remover todas as etiquetas?"
 
-#: rapid/preferencesdialog.py:437 rapid/preferencesdialog.py:714
+#: rapid/preferencesdialog.py:440 rapid/preferencesdialog.py:717
 msgid "Should all Job Codes be removed?"
 msgstr "Deseja realmente remover todas as etiquetas?"
 
-#: rapid/preferencesdialog.py:443
+#: rapid/preferencesdialog.py:446
 msgid "Remove all Remembered Paths?"
 msgstr "Remover todos os caminhos lembrados"
 
-#: rapid/preferencesdialog.py:444
+#: rapid/preferencesdialog.py:447
 msgid "Should all remembered paths be removed?"
 msgstr "Todos os caminhos lembrados devem ser removidos?"
 
-#: rapid/preferencesdialog.py:450
+#: rapid/preferencesdialog.py:453
 msgid "Remove all Ignored Paths?"
 msgstr "Remover todos os Caminhos Ignorados?"
 
-#: rapid/preferencesdialog.py:451
+#: rapid/preferencesdialog.py:454
 msgid "Should all ignored paths be removed?"
 msgstr "Todos os caminhos ignorados devem ser removidos?"
 
-#: rapid/preferencesdialog.py:462
+#: rapid/preferencesdialog.py:465
 msgid "Error in Photo Rename preferences"
 msgstr "Erro causado pelas preferêcias em \"renomear fotografias\""
 
-#: rapid/preferencesdialog.py:642
+#: rapid/preferencesdialog.py:645
 msgid "Error in Video Rename preferences"
 msgstr "Erro causado pelas preferêcias em \"renomear vídeos\""
 
-#: rapid/preferencesdialog.py:663
+#: rapid/preferencesdialog.py:666
 msgid "Error in Photo Download Subfolders preferences"
 msgstr ""
 "Erro causado pelas preferêcias de subdiretórios em \"diretórios de "
 "fotografias\""
 
-#: rapid/preferencesdialog.py:680
+#: rapid/preferencesdialog.py:683
 msgid "Error in Video Download Subfolders preferences"
 msgstr ""
 "Erro causado pelas preferêcias de subdiretórios em \"diretórios de vídeo\""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:739
+#: rapid/preferencesdialog.py:742
 msgid "Enter a Job Code"
 msgstr "Definir uma etiqueta"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:755
+#: rapid/preferencesdialog.py:758
 msgid "Enter a new Job Code, or select a previous one"
 msgstr "Defina uma nova etiqueta or selecione uma já presente"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:758
+#: rapid/preferencesdialog.py:761
 msgid "Enter a new Job Code"
 msgstr "Defina uma nova etiqueta"
 
-#: rapid/preferencesdialog.py:763
+#: rapid/preferencesdialog.py:766
 msgid "Job Code:"
 msgstr "Etiqueta:"
 
-#: rapid/preferencesdialog.py:819
+#: rapid/preferencesdialog.py:822
 msgid "Enter a Path to Ignore"
 msgstr "Entre um Caminho a ser Ignorado"
 
-#: rapid/preferencesdialog.py:831
+#: rapid/preferencesdialog.py:834
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr "Especifique um caminho onde fotos e vídeos não devem ser procurados"
 
-#: rapid/preferencesdialog.py:836
+#: rapid/preferencesdialog.py:839
 msgid "Path:"
 msgstr "Caminho:"
 
-#: rapid/preferencesdialog.py:1079
+#: rapid/preferencesdialog.py:1092
 msgid "Job Code"
 msgstr "Etiqueta"
 
-#: rapid/preferencesdialog.py:1350
+#: rapid/preferencesdialog.py:1363
 msgid "Select a folder in which to backup photos"
 msgstr "Selecione uma pasta onde será executado o backup das fotos"
 
-#: rapid/preferencesdialog.py:1363
+#: rapid/preferencesdialog.py:1376
 msgid "Select a folder in which to backup videos"
 msgstr "Selecione uma pasta onde será executado o backup dos vídeos"
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/preferencesdialog.py:1458
+#: rapid/preferencesdialog.py:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -942,7 +1002,7 @@ msgstr ""
 "<i><b>Aviso:</b> As meta-Informações disponíveis são insuficientes para "
 "gerar um nome de arquivo. Por favor, use outras opções de renomeação.</i>"
 
-#: rapid/preferencesdialog.py:1509
+#: rapid/preferencesdialog.py:1524
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -952,13 +1012,13 @@ msgstr ""
 "nomeação.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/preferencesdialog.py:1512
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Exemplo: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1602
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -969,7 +1029,7 @@ msgstr ""
 "inválidas e não poderão ser usadas.\n"
 "Elas serão redefinidas para seus valores padrão."
 
-#: rapid/preferencesdialog.py:1747
+#: rapid/preferencesdialog.py:1762
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -980,7 +1040,7 @@ msgstr ""
 "ser que sejam corrigidas:\n"
 "%s"
 
-#: rapid/preferencesdialog.py:1749
+#: rapid/preferencesdialog.py:1764
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -991,142 +1051,147 @@ msgstr ""
 "corrigida:\n"
 "%s"
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1765
 msgid "Invalid regular expression"
 msgstr "Expressão regular inválida"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1931
+#: rapid/preferencesdialog.py:1949
 msgid "externaldrive1"
 msgstr "disco_externo_1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1933
+#: rapid/preferencesdialog.py:1951
 msgid "externaldrive2"
 msgstr "disco_externo_2"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:127
 msgid "New York"
 msgstr "Nova Iorque"
 
-#: 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 "Helsinque"
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Tehran"
 msgstr "Teerã"
 
-#: 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 "Berlim"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Budapest"
 msgstr "Budapeste"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Rome"
 msgstr "Roma"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Moscow"
 msgstr "Moscou"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Delhi"
 msgstr "Deli"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Warsaw"
 msgstr "Varsóvia"
 
-#: rapid/prefsrapid.py:130
+#: rapid/prefsrapid.py:131
 msgid "Jakarta"
 msgstr "Jacarta"
 
-#: rapid/prefsrapid.py:130
+#: rapid/prefsrapid.py:131
 msgid "Madrid"
 msgstr "Madri"
 
-#: rapid/prefsrapid.py:130
+#: rapid/prefsrapid.py:131
 msgid "Stockholm"
 msgstr "Estocolmo"
 
 #. components
-#: rapid/problemnotification.py:26 rapid/subfolderfile.py:357
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
 msgstr "subdiretório"
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:355
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr "nome de arquivo"
 
-#: rapid/problemnotification.py:80
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr "Data e hora %s valor aparece inválido."
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:86
 msgid "Filename does not have an extension."
 msgstr "Nome do arquivo não tem extensão."
 
 #. a number component is something like the 8346 in IMG_8346.JPG
-#: rapid/problemnotification.py:83
+#: rapid/problemnotification.py:88
 msgid "Filename does not have a number component."
 msgstr "Nome do arquivo não tem um componente número."
 
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr "Erro ao gerar o componente %s"
 
 #. a generic problem
-#: rapid/problemnotification.py:86
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr "%(filetype)s metadados não podem ser lidos"
 
-#: rapid/problemnotification.py:88
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "%(filetype)s %(area)s não pode ser gerado"
 
-#: rapid/problemnotification.py:90 rapid/problemnotification.py:91
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr "Ocorreu um erro ao copiar %(filetype)s"
 
-#: rapid/problemnotification.py:93 rapid/problemnotification.py:94
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr ""
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "%(filetype)s já existe."
 
-#: rapid/problemnotification.py:97
+#: rapid/problemnotification.py:105
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1135,7 +1200,7 @@ msgstr ""
 "%(filetype)s não pôde ser feito backup porque nenhum local de backup foi "
 "encontrado."
 
-#: rapid/problemnotification.py:102
+#: rapid/problemnotification.py:110
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -1144,12 +1209,12 @@ msgstr ""
 "%(image1)s foi tomada em %(image1_date)s em %(image1_time)s, e %(image2)s em "
 "%(image2_date)s em %(image2_time)s."
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "%(filetype)s já foi baixado"
 
-#: rapid/problemnotification.py:107
+#: rapid/problemnotification.py:115
 #, python-format
 msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
@@ -1158,56 +1223,62 @@ msgstr ""
 "O atual%(filetype)s foi modificada pela última vez em%(date)s em%(time)s. "
 "Identificador exclusivo '%(identifier)s'' acrescentou."
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:116
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 "O %(filetype)s existente foi modificado pela ultima vez em %(date)s as "
 "%(time)s."
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:117
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr "Não há dados com os quais o nome %(filetype)s."
 
-#: rapid/problemnotification.py:111
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Erro: %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:201
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr "Os metadados podem estar corrompidos."
 
-#: rapid/problemnotification.py:204
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
 msgstr ""
 "A extensão do arquivo e informações Exif indicam que já foram baixados."
 
-#: rapid/problemnotification.py:223
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " Foi feito backup para %(volume)s"
 
-#: rapid/problemnotification.py:225
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr " Foi feito backup destes dispositivos: "
 
-#: rapid/problemnotification.py:227 rapid/problemnotification.py:288
-#: rapid/problemnotification.py:300
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s e %(final_volume)s."
 
-#: rapid/problemnotification.py:240
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
@@ -1216,254 +1287,310 @@ msgstr ""
 "Fotos detectadas com o mesmo nome, mas tiradas em momentos diferentes: "
 "%(details)s"
 
-#: rapid/problemnotification.py:257
+#: rapid/problemnotification.py:269
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr "Ouvir Ocorreu um erro ao fazer backup em %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:259
+#: rapid/problemnotification.py:271
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr "Ouvir Ocorreu um erro ao fazer backup em %(volume)s."
 
-#: rapid/problemnotification.py:261
+#: rapid/problemnotification.py:273
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr "Ocorreram erros ao fazer backup em dispositivos de backup a seguir: "
 
-#: rapid/problemnotification.py:265 rapid/problemnotification.py:313
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:267
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:271 rapid/problemnotification.py:315
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, 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:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s e %(volume)s."
 
-#: rapid/problemnotification.py:284
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "Backup já existe no %(volume)s."
 
-#: rapid/problemnotification.py:286
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr "Os backups já existem nestes locais: "
 
-#: rapid/problemnotification.py:296
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "Backup substituído em %(volume)s."
 
-#: rapid/problemnotification.py:298
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr "Backups substituídos nestes dispositivos: "
 
-#: rapid/problemnotification.py:309
+#: rapid/problemnotification.py:321
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr "Ocorreu um erro ao criar diretórios em %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:311
+#: rapid/problemnotification.py:323
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 "Ocorreram erros ao criar diretórios nos dispositivos de backup a seguir: "
 
-#: rapid/problemnotification.py:322
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "%(previousproblem)s Adicionalmente, %(newproblem)s"
 
-#: rapid/problemnotification.py:330
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " Além disso, houve %(problems)s."
 
-#: rapid/problemnotification.py:332
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " Além disso, houve um %(problem)s."
 
-#: rapid/problemnotification.py:341
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Os metadados %(type)s estão faltando."
 
-#: rapid/problemnotification.py:343
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr "Os metadados seguinte estão em falta: "
 
-#: rapid/problemnotification.py:346
+#: rapid/problemnotification.py:371
 #, 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:388
 msgid "Problems in subfolder and filename generation"
 msgstr "Problemas na subpasta e arquivo de geração"
 
-#: rapid/problemnotification.py:365
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr "Problema na subpasta e arquivo de geração"
 
-#: rapid/problemnotification.py:368
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Problemas na geração de %s"
 
-#: rapid/problemnotification.py:370
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Problema na geração de %s"
 
-#: rapid/problemnotification.py:379
+#: rapid/problemnotification.py:404
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr "%(filetype)s já existe, mas foi feito backup"
 
-#: rapid/problemnotification.py:381
+#: rapid/problemnotification.py:406
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr "Ocorreu um erro ao copiar %(filetype)s, mas foi feito backup"
 
-#: rapid/problemnotification.py:401
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr "Vários problemas foram encontrados"
 
-#: rapid/problemnotification.py:403 rapid/subfolderfile.py:232
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 "Foram detectadas fotografias de mesmo nome, mas de horários diferentes"
 
-#: rapid/problemnotification.py:409
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr "houve erros de backup"
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr "Houve erros de backup"
 
-#: rapid/problemnotification.py:412
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr "Ocorreu um erro ao fazer backup"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr "Houve um erro ao fazer backup"
 
 #. e.g.
-#: rapid/problemnotification.py:416
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, e %(backinguperror)s"
 
-#: rapid/rpdfile.py:141
+#: rapid/rpdfile.py:159
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/subfolderfile.py:79
+#: rapid/rpdfile.py:169
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
+msgstr ""
+
+#: rapid/subfolderfile.py:81
 #, 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:325
+msgid "subfolder and filename"
+msgstr "subdiretório e nome de arquivo"
+
+#: rapid/subfolderfile.py:406
 msgid "Photo has already been downloaded"
 msgstr "A foto já foi baixada"
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:407
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Origem: %(source)s"
 
-#: rapid/subfolderfile.py:353
-msgid "subfolder and filename"
-msgstr "subdiretório e nome de arquivo"
-
-#: rapid/subfolderfile.py:392
+#: rapid/subfolderfile.py:485
 msgid "Failed to create download subfolder"
 msgstr "Falha ao criar subpasta download"
 
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:486
 #, python-format
 msgid "Path: %s"
 msgstr "Caminho: %s"
 
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr ""
+
 #: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
+msgstr "_Verificar Tudo"
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "Fazer uma _doação..."
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr "_Ajuda Online..."
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr "_Reportar um problema..."
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr "_Desmarcar Tudo"
+
+#: rapid/glade3/rapid.ui.h:16
 msgid "_File"
 msgstr "_Arquivo"
 
-#: rapid/glade3/rapid.ui.h:3
+#: rapid/glade3/rapid.ui.h:17
 msgid "Download / Pause"
 msgstr "Download / Pausa"
 
-#: rapid/glade3/rapid.ui.h:4
+#: rapid/glade3/rapid.ui.h:18
 msgid "_Select"
 msgstr "_Selecionar"
 
-#: rapid/glade3/rapid.ui.h:5
+#: rapid/glade3/rapid.ui.h:19
 msgid "Select All Without _Job Code"
 msgstr "Selecionar Tudo Sem Código _Job"
 
-#: rapid/glade3/rapid.ui.h:6
+#: rapid/glade3/rapid.ui.h:20
 msgid "Select All Wit_h Job Code"
 msgstr "Selecionar o código de trabalho Wit_h"
 
-#: rapid/glade3/rapid.ui.h:7
+#: rapid/glade3/rapid.ui.h:21
 msgid "_View"
 msgstr "E_xibir"
 
-#: rapid/glade3/rapid.ui.h:8
+#: rapid/glade3/rapid.ui.h:22
 msgid "_Error Log"
 msgstr "Registro de _Erros"
 
-#: rapid/glade3/rapid.ui.h:9
+#: rapid/glade3/rapid.ui.h:23
 msgid "_Clear Completed Downloads"
 msgstr "_Limpar tarefas conluídas"
 
-#: rapid/glade3/rapid.ui.h:10
+#: rapid/glade3/rapid.ui.h:24
 msgid "Previous File"
 msgstr "Arquivo Anterior"
 
-#: rapid/glade3/rapid.ui.h:11
+#: rapid/glade3/rapid.ui.h:25
 msgid "Next File"
 msgstr "Próximo Arquivo"
 
-#: rapid/glade3/rapid.ui.h:12
+#: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: rapid/glade3/rapid.ui.h:13
-msgid "_Make a Donation..."
-msgstr "Fazer uma _doação..."
-
-#: rapid/glade3/rapid.ui.h:14
+#: rapid/glade3/rapid.ui.h:27
 msgid "_Translate this Application..."
 msgstr "_Traduzir este aplicativo..."
 
-#: rapid/glade3/rapid.ui.h:15
-msgid "_Check All"
-msgstr "_Verificar Tudo"
-
-#: rapid/glade3/rapid.ui.h:16
-msgid "_Uncheck All"
-msgstr "_Desmarcar Tudo"
-
-#: rapid/glade3/rapid.ui.h:17
+#: rapid/glade3/rapid.ui.h:28
 msgid "_Include in download"
 msgstr "_Incluir no download"
 
-#: rapid/glade3/rapid.ui.h:18
+#: rapid/glade3/rapid.ui.h:29
 msgid "_Download"
 msgstr "_Baixar"
 
@@ -1779,7 +1906,7 @@ msgstr ""
 "discos rígidos externos."
 
 #: rapid/glade3/prefs.ui.h:69
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr "Fazer backup de fotos e vídeos ao baixar"
 
 #: rapid/glade3/prefs.ui.h:70
@@ -1821,8 +1948,8 @@ msgid "Video backup location:"
 msgstr "Local do backup de Vídeos:"
 
 #: rapid/glade3/prefs.ui.h:79
-msgid "Backup"
-msgstr "Backup"
+msgid "Back up"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:80
 msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
@@ -1857,35 +1984,39 @@ msgstr "Sair do programa mesmo que o download tivesse avisos ou erros"
 msgid "Automatically rotate JPEG images"
 msgstr "Rotacionar imagens JPEG automaticamente"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:90
 msgid "Performance"
 msgstr "Performance"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:91
 msgid "Generate thumbnails (slower)"
 msgstr "Gerar miniaturas (mais lento)"
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:92
 msgid "Miscellaneous"
 msgstr "Diversos"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Conflitos de Nomes de Fotos e Vídeos</b>"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Add unique identifier"
 msgstr "Adicionar identificador único"
 
-#: rapid/glade3/prefs.ui.h:94
+#: rapid/glade3/prefs.ui.h:96
 msgid "Skip download"
 msgstr "Pular download"
 
-#: rapid/glade3/prefs.ui.h:95
+#: rapid/glade3/prefs.ui.h:97
 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."
@@ -1893,7 +2024,7 @@ msgstr ""
 "Escolha como o programa deverá proceder caso ao copiar uma fotografia ou "
 "vídeo haja um arquivo de mesmo nome."
 
-#: rapid/glade3/prefs.ui.h:96
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1901,15 +2032,15 @@ msgstr ""
 "Escolha como o programa deverá proceder caso ao fazer uma cópia de segurança "
 "haja um arquivo de mesmo nome."
 
-#: rapid/glade3/prefs.ui.h:97
+#: rapid/glade3/prefs.ui.h:99
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: rapid/glade3/prefs.ui.h:98
+#: rapid/glade3/prefs.ui.h:100
 msgid "Skip"
 msgstr "Pular"
 
-#: rapid/glade3/prefs.ui.h:99
+#: rapid/glade3/prefs.ui.h:101
 msgid "Error Handling"
 msgstr "Tratamento de Erros"
 
@@ -1917,12 +2048,6 @@ msgstr "Tratamento de Erros"
 msgid "Import your photos and videos efficiently and reliably"
 msgstr "Importar fotos e vídeos de forma eficiente e confiável"
 
-#~ msgid "_Get Help Online..."
-#~ msgstr "_Ajuda Online..."
-
-#~ msgid "_Report a Problem..."
-#~ msgstr "_Reportar um problema..."
-
 #~ msgid ""
 #~ "This version of the program uses different preferences than the old version. "
 #~ "Some of your previous preferences were invalid, and could not be updated. "
@@ -2297,6 +2422,9 @@ msgstr "Importar fotos e vídeos de forma eficiente e confiável"
 #~ msgid "Automatically start download is true"
 #~ msgstr "Iniciar download automaticamente é verdadeiro"
 
+#~ msgid "Backup"
+#~ msgstr "Backup"
+
 #~ msgid "Backup location:"
 #~ msgstr "Localização do Backup:"
 
diff --git a/po/rapid-photo-downloader.pot b/po/rapid-photo-downloader.pot
index 53ee5f1..1c810f0 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: 2013-10-19 23:20+0500\n"
+"POT-Creation-Date: 2014-02-23 21:38+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,7 +18,7 @@ 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:117 rapid/rapid.py:1807 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 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:1240
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr ""
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1805
+#: rapid/rapid.py:1818
 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:1809
+#: rapid/rapid.py:1822
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr ""
 
-#: rapid/rapid.py:1810
+#: rapid/rapid.py:1823
 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:2254
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr ""
 
-#: rapid/rapid.py:2257
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr ""
 
-#: rapid/rapid.py:2362
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -101,183 +101,194 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: rapid/rapid.py:2365
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
 
-#: rapid/rapid.py:2366
+#: rapid/rapid.py:2380
 msgid "Download cannot proceed"
 msgstr ""
 
-#: rapid/rapid.py:2746
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr ""
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr ""
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr ""
+
+#: rapid/rapid.py:2802
 msgid "About 1 second remaining"
 msgstr ""
 
-#: rapid/rapid.py:2748
+#: rapid/rapid.py:2804
 #, python-format
 msgid "About %i seconds remaining"
 msgstr ""
 
-#: rapid/rapid.py:2750
+#: rapid/rapid.py:2806
 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:2755
+#: rapid/rapid.py:2811
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr ""
 
-#: rapid/rapid.py:2777 rapid/rpdfile.py:129
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
 msgid "photos and videos"
 msgstr ""
 
-#: rapid/rapid.py:2779 rapid/rpdfile.py:131
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
 msgid "photos or videos"
 msgstr ""
 
-#: rapid/rapid.py:2782 rapid/rapid.py:3626 rapid/rpdfile.py:134
-msgid "videos"
-msgstr ""
-
-#: rapid/rapid.py:2784 rapid/preferencesdialog.py:1630 rapid/rpdfile.py:136
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
 #: rapid/rpdfile.py:305
 msgid "video"
 msgstr ""
 
-#: rapid/rapid.py:2787 rapid/rapid.py:3624 rapid/rpdfile.py:139
-msgid "photos"
-msgstr ""
-
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2789 rapid/preferencesdialog.py:1629 rapid/rpdfile.py:141
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
 #: rapid/rpdfile.py:286
 msgid "photo"
 msgstr ""
 
-#: rapid/rapid.py:2816
+#: rapid/rapid.py:2872
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2820
+#: rapid/rapid.py:2876
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: rapid/rapid.py:2823 rapid/rapid.py:2879
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
 msgid "warnings"
 msgstr ""
 
-#: rapid/rapid.py:2836
+#: rapid/rapid.py:2892
 msgid "All downloads complete"
 msgstr ""
 
-#: rapid/rapid.py:2842 rapid/rapid.py:2851 rapid/rapid.py:2860
-#: rapid/rapid.py:2869 rapid/rapid.py:2877
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: rapid/rapid.py:2844 rapid/rapid.py:2862
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2853 rapid/rapid.py:2871
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2914
+#: rapid/rapid.py:2970
 #, 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:2921
+#: rapid/rapid.py:2977
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr ""
 
-#: rapid/rapid.py:3275
+#: rapid/rapid.py:3331
 msgid "From"
 msgstr ""
 
-#: rapid/rapid.py:3283
+#: rapid/rapid.py:3339
 msgid "Auto Detect"
 msgstr ""
 
-#: rapid/rapid.py:3287 rapid/preferencesdialog.py:1337
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr ""
 
-#: rapid/rapid.py:3328
+#: rapid/rapid.py:3384
 msgid "Copy"
 msgstr ""
 
-#: rapid/rapid.py:3341
+#: rapid/rapid.py:3397
 msgid "Move"
 msgstr ""
 
-#: rapid/rapid.py:3363
+#: rapid/rapid.py:3419
 msgid "To"
 msgstr ""
 
-#: rapid/rapid.py:3370 rapid/rapid.py:4056
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
 msgid "Photos:"
 msgstr ""
 
-#: rapid/rapid.py:3373 rapid/preferencesdialog.py:1174
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
 msgid "Select a folder to download photos to"
 msgstr ""
 
-#: rapid/rapid.py:3385 rapid/rapid.py:4056
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
 msgid "Videos:"
 msgstr ""
 
-#: rapid/rapid.py:3387 rapid/preferencesdialog.py:1192
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
 msgid "Select a folder to download videos to"
 msgstr ""
 
-#: rapid/rapid.py:3594
+#: rapid/rapid.py:3650
 msgid "and"
 msgstr ""
 
-#: rapid/rapid.py:3599
+#: rapid/rapid.py:3655
 msgid "Using backup devices"
 msgstr ""
 
-#: rapid/rapid.py:3601
+#: rapid/rapid.py:3657
 msgid "Using backup device"
 msgstr ""
 
-#: rapid/rapid.py:3603
+#: rapid/rapid.py:3659
 msgid "No backup devices detected"
 msgstr ""
 
-#: rapid/rapid.py:3630
+#: rapid/rapid.py:3686
 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:3642
+#: rapid/rapid.py:3698
 #, 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:3646
+#: rapid/rapid.py:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr ""
@@ -285,166 +296,187 @@ 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:3651
+#: rapid/rapid.py:3707
 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:3656
+#: rapid/rapid.py:3712
 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:3662
+#: rapid/rapid.py:3718
 #, python-format
 msgid "%(free)s free"
 msgstr ""
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3670
+#: rapid/rapid.py:3726
 #, python-format
 msgid "Backing up photos and videos to %(path)s"
 msgstr ""
 
 #. user manually specified backup location
-#: rapid/rapid.py:3673
+#: rapid/rapid.py:3729
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr ""
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3676
+#: rapid/rapid.py:3732
 #, python-format
 msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr ""
 
-#: rapid/rapid.py:3683
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr ""
 
-#: rapid/rapid.py:3712
+#: rapid/rapid.py:3768
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: rapid/rapid.py:3838 rapid/rpdfile.py:287
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
 msgid "Photo"
 msgstr ""
 
-#: rapid/rapid.py:3840 rapid/rpdfile.py:306
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr ""
 
-#: rapid/rapid.py:3849
+#: rapid/rapid.py:3921
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr ""
 
-#: rapid/rapid.py:3851 rapid/rapid.py:3865 rapid/rapid.py:3878
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
 msgid "Folder: %s"
 msgstr ""
 
-#: rapid/rapid.py:3863
+#: rapid/rapid.py:3935
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr ""
 
-#: rapid/rapid.py:3876
+#: rapid/rapid.py:3948
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr ""
 
-#: rapid/rapid.py:3962
+#: rapid/rapid.py:4034
 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:4017
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
 "(default: %default)"
 msgstr ""
 
-#: rapid/rapid.py:4018
+#: rapid/rapid.py:4090
 msgid "display debugging information when run from the command line"
 msgstr ""
 
-#: rapid/rapid.py:4019
+#: rapid/rapid.py:4091
 msgid "only output errors to the command line"
 msgstr ""
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:4021
+#: rapid/rapid.py:4093
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 
-#: rapid/rapid.py:4023
+#: rapid/rapid.py:4095
 msgid ""
 "automatically detect devices from which to download, overwriting existing "
 "program preferences"
 msgstr ""
 
-#: rapid/rapid.py:4024
+#: rapid/rapid.py:4096
 msgid ""
 "manually specify the PATH of the device from which to download, overwriting "
 "existing program preferences"
 msgstr ""
 
-#: rapid/rapid.py:4025
+#: rapid/rapid.py:4097
 msgid "reset all program settings and preferences and exit"
 msgstr ""
 
-#: rapid/rapid.py:4038
+#: rapid/rapid.py:4110
 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:4061
+#: rapid/rapid.py:4133
 #, python-format
 msgid "and %s"
 msgstr ""
 
-#: rapid/rapid.py:4069
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
 msgstr ""
 
-#: rapid/backupfile.py:174 rapid/backupfile.py:200
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
 msgid "Backing up error"
 msgstr ""
 
-#: rapid/backupfile.py:176
+#: rapid/backupfile.py:151
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr ""
 
-#: rapid/backupfile.py:178 rapid/backupfile.py:202 rapid/subfolderfile.py:206
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
 "Source: %(source)s\n"
 "Destination: %(destination)s"
 msgstr ""
 
-#: rapid/backupfile.py:181 rapid/backupfile.py:204
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
 msgid "Error: %(inst)s"
 msgstr ""
 
-#: rapid/copyfiles.py:163 rapid/subfolderfile.py:221
-#: rapid/subfolderfile.py:446 rapid/subfolderfile.py:468
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
 "%(problem)s\n"
 "File: %(file)s"
 msgstr ""
 
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr ""
+
 #: rapid/device.py:80
 msgid "Device Detected"
 msgstr ""
@@ -939,26 +971,26 @@ 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:1471
+#: rapid/preferencesdialog.py:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1522
+#: rapid/preferencesdialog.py:1524
 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:1525
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr ""
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1615
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -966,7 +998,7 @@ msgid ""
 "They will be reset to their default values."
 msgstr ""
 
-#: rapid/preferencesdialog.py:1760
+#: rapid/preferencesdialog.py:1762
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -974,7 +1006,7 @@ msgid ""
 " %s"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1762
+#: rapid/preferencesdialog.py:1764
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -982,17 +1014,17 @@ msgid ""
 " %s"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1763
+#: rapid/preferencesdialog.py:1765
 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:1944
+#: rapid/preferencesdialog.py:1949
 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:1946
+#: rapid/preferencesdialog.py:1951
 msgid "externaldrive2"
 msgstr ""
 
@@ -1069,278 +1101,300 @@ msgid "Stockholm"
 msgstr ""
 
 #. components
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:461
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
 msgstr ""
 
-#: rapid/problemnotification.py:28 rapid/subfolderfile.py:459
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr ""
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr ""
 
-#: rapid/problemnotification.py:82
+#: rapid/problemnotification.py:86
 msgid "Filename does not have an extension."
 msgstr ""
 
 #. a number component is something like the 8346 in IMG_8346.JPG
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:88
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: rapid/problemnotification.py:85
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr ""
 
 #. a generic problem
-#: rapid/problemnotification.py:87
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr ""
 
-#: rapid/problemnotification.py:89
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr ""
 
-#: rapid/problemnotification.py:91 rapid/problemnotification.py:92
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr ""
 
-#: rapid/problemnotification.py:94 rapid/problemnotification.py:95
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr ""
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr ""
 
-#: rapid/problemnotification.py:98
+#: rapid/problemnotification.py:105
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
 "were found."
 msgstr ""
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:110
 #, 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:104
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr ""
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:115
 #, 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:109
+#: rapid/problemnotification.py:116
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 
-#: rapid/problemnotification.py:110
+#: rapid/problemnotification.py:117
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr ""
 
-#: rapid/problemnotification.py:112
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr ""
 
-#: rapid/problemnotification.py:202
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr ""
 
-#: rapid/problemnotification.py:205
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
 msgstr ""
 
-#: rapid/problemnotification.py:224
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr ""
 
-#: rapid/problemnotification.py:226
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr ""
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr ""
 
-#: rapid/problemnotification.py:229 rapid/problemnotification.py:290
-#: rapid/problemnotification.py:302
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:241
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
 "%(details)s"
 msgstr ""
 
-#: rapid/problemnotification.py:258
+#: rapid/problemnotification.py:269
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr ""
 
-#: rapid/problemnotification.py:260
+#: rapid/problemnotification.py:271
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:262
+#: rapid/problemnotification.py:273
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr ""
 
-#: rapid/problemnotification.py:266 rapid/problemnotification.py:314
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr ""
 
-#: rapid/problemnotification.py:268
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr ""
 
-#: rapid/problemnotification.py:272 rapid/problemnotification.py:316
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr ""
 
-#: rapid/problemnotification.py:277
+#: rapid/problemnotification.py:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:285
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:287
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr ""
 
-#: rapid/problemnotification.py:297
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:299
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr ""
 
-#: rapid/problemnotification.py:310
+#: rapid/problemnotification.py:321
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr ""
 
-#: rapid/problemnotification.py:312
+#: rapid/problemnotification.py:323
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 
-#: rapid/problemnotification.py:323
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr ""
 
-#: rapid/problemnotification.py:331
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr ""
 
-#: rapid/problemnotification.py:333
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr ""
 
-#: rapid/problemnotification.py:342
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: rapid/problemnotification.py:344
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr ""
 
-#: rapid/problemnotification.py:347
+#: rapid/problemnotification.py:371
 #, python-format
 msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr ""
 
-#: rapid/problemnotification.py:364
+#: rapid/problemnotification.py:388
 msgid "Problems in subfolder and filename generation"
 msgstr ""
 
-#: rapid/problemnotification.py:366
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr ""
 
-#: rapid/problemnotification.py:369
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr ""
 
-#: rapid/problemnotification.py:371
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr ""
 
-#: rapid/problemnotification.py:380
+#: rapid/problemnotification.py:404
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr ""
 
-#: rapid/problemnotification.py:382
+#: rapid/problemnotification.py:406
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 
-#: rapid/problemnotification.py:402
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr ""
 
-#: rapid/problemnotification.py:404 rapid/subfolderfile.py:265
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr ""
 
-#: rapid/problemnotification.py:411
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr ""
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr ""
 
-#: rapid/problemnotification.py:414
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr ""
 
 #. e.g.
-#: rapid/problemnotification.py:417
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr ""
@@ -1355,98 +1409,138 @@ msgstr ""
 msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 msgstr ""
 
-#: rapid/subfolderfile.py:82
+#: rapid/subfolderfile.py:81
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr ""
 
-#: rapid/subfolderfile.py:396
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr ""
+
+#: rapid/subfolderfile.py:406
 msgid "Photo has already been downloaded"
 msgstr ""
 
-#: rapid/subfolderfile.py:397
+#: rapid/subfolderfile.py:407
 #, python-format
 msgid "Source: %(source)s"
 msgstr ""
 
-#: rapid/subfolderfile.py:457
-msgid "subfolder and filename"
-msgstr ""
-
-#: rapid/subfolderfile.py:500 rapid/subfolderfile.py:511
+#: rapid/subfolderfile.py:485
 msgid "Failed to create download subfolder"
 msgstr ""
 
-#: rapid/subfolderfile.py:501 rapid/subfolderfile.py:512
+#: rapid/subfolderfile.py:486
 #, python-format
 msgid "Path: %s"
 msgstr ""
 
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr ""
+
 #: rapid/glade3/rapid.ui.h:2
-msgid "_File"
+msgid "_Check All"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:3
-msgid "Download / Pause"
+msgid "Check All Photos"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:4
-msgid "_Select"
+msgid "Check All Videos"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:5
-msgid "Select All Without _Job Code"
-msgstr ""
-
-#: rapid/glade3/rapid.ui.h:6
-msgid "Select All Wit_h Job Code"
+msgid "_Make a Donation..."
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:7
-msgid "_View"
+msgid "_Get Help Online..."
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:8
-msgid "_Error Log"
+msgid "Help"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:9
-msgid "_Clear Completed Downloads"
+msgid "Preferences"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:10
-msgid "Previous File"
+msgid "Quit"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:11
-msgid "Next File"
+msgid "Refresh"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:12
-msgid "_Help"
+msgid "_Report a Problem..."
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:13
-msgid "_Make a Donation..."
+msgid "Translate this Application..."
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:14
-msgid "_Translate this Application..."
-msgstr ""
-
-#: rapid/glade3/rapid.ui.h:15
-msgid "_Check All"
+msgid "_Uncheck All"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:16
-msgid "_Uncheck All"
+msgid "_File"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:17
-msgid "_Include in download"
+msgid "Download / Pause"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:18
+msgid "_Select"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:19
+msgid "Select All Without _Job Code"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:20
+msgid "Select All Wit_h Job Code"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:21
+msgid "_View"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:22
+msgid "_Error Log"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:23
+msgid "_Clear Completed Downloads"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:24
+msgid "Previous File"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:25
+msgid "Next File"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:26
+msgid "_Help"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:27
+msgid "_Translate this Application..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:28
+msgid "_Include in download"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:29
 msgid "_Download"
 msgstr ""
 
@@ -1727,7 +1821,7 @@ msgid ""
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:69
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:70
@@ -1799,55 +1893,59 @@ msgstr ""
 msgid "Automatically rotate JPEG images"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:90
 msgid "Performance"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:91
 msgid "Generate thumbnails (slower)"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:92
 msgid "Miscellaneous"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Add unique identifier"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:94
+#: rapid/glade3/prefs.ui.h:96
 msgid "Skip download"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:95
+#: rapid/glade3/prefs.ui.h:97
 msgid ""
 "When a photo or video of the same name has already been downloaded, choose "
 "whether to skip downloading the file, or to add a unique indentifier."
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:96
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:97
+#: rapid/glade3/prefs.ui.h:99
 msgid "Overwrite"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:98
+#: rapid/glade3/prefs.ui.h:100
 msgid "Skip"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:99
+#: rapid/glade3/prefs.ui.h:101
 msgid "Error Handling"
 msgstr ""
 
diff --git a/po/ro.po b/po/ro.po
index 868123b..8fb9288 100644
--- a/po/ro.po
+++ b/po/ro.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-03-20 18:23-0500\n"
-"PO-Revision-Date: 2011-03-15 12:19+0000\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:14+0000\n"
 "Last-Translator: bert <crinbert@yahoo.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-04 05:24+0000\n"
-"X-Generator: Launchpad (build 12710)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:97 rapid/glade3/rapid.ui.h:11
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Foto Descărcător"
 
-#: rapid/rapid.py:102
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,83 +31,266 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:104
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:107
-#, python-format
-msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
-msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
-
-#: rapid/rapid.py:114
+#: rapid/rapid.py:127
 #, 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:145
+#: rapid/rapid.py:162
 msgid "Device"
 msgstr "Dispozitiv"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:159
+#: rapid/rapid.py:180
 msgid "Size"
 msgstr "Mărime"
 
-#: rapid/rapid.py:162
+#: rapid/rapid.py:183
 msgid "Download Progress"
 msgstr "Progresul Descărcării"
 
+#: rapid/rapid.py:343
+#, python-format
+msgid "%(device)s did not unmount"
+msgstr ""
+
 #. This refers to when a device like a hard drive is having its contents scanned,
 #. looking for photos or videos. It is visible initially in the progress bar for each device
 #. (which normally holds "x photos and videos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:938
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr "scanez"
 
-#: rapid/rapid.py:1639
+#. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
+#: rapid/rapid.py:1818
+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:1822
+#, python-format
+msgid "Downloading from %(location)s."
+msgstr ""
+
+#: rapid/rapid.py:1823
+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:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr ""
 
-#: rapid/rapid.py:1642
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr ""
 
-#. ~ scan_pid = rpd_file.scan_pid
-#. ~ unique_id = rpd_file.unique_id
-#: rapid/rapid.py:1906
+#: rapid/rapid.py:2376
 #, python-format
-msgid "%(number)s of %(total)s %(filetypes)s"
-msgstr "%(number)s din %(total)s %(filetypes)s"
+msgid ""
+"These download folders are invalid:\n"
+"%(folder1)s\n"
+"%(folder2)s"
+msgstr ""
 
-#: rapid/rapid.py:2239 rapid/preferencesdialog.py:817 rapid/rpdfile.py:118
+#: rapid/rapid.py:2379
+#, python-format
+msgid ""
+"This download folder is invalid:\n"
+"%s"
+msgstr ""
+
+#: rapid/rapid.py:2380
+msgid "Download cannot proceed"
+msgstr "Descărcarea nu poate continua"
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
 msgid "photos"
 msgstr "fotografii"
 
-#: rapid/rapid.py:2241 rapid/rpdfile.py:113
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
 msgid "videos"
 msgstr "video"
 
-#: rapid/rapid.py:2244
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr ""
+
+#: rapid/rapid.py:2802
+msgid "About 1 second remaining"
+msgstr "Aproximativ 1 secundă rămâne"
+
+#: rapid/rapid.py:2804
+#, python-format
+msgid "About %i seconds remaining"
+msgstr "Aproximativ %i secunde rămân"
+
+#: rapid/rapid.py:2806
+msgid "About 1 minute remaining"
+msgstr "Aprozimativ 1 minut rămâne"
+
+#. 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:2811
+#, python-format
+msgid "About %(minutes)i:%(seconds)02i minutes remaining"
+msgstr "Aproximativ %(minutes)i:%(seconds)-2i minute rămân"
+
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
+msgid "photos and videos"
+msgstr "fotografii și video"
+
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
+msgid "photos or videos"
+msgstr "fotografii și video"
+
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
+msgid "video"
+msgstr "video"
+
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
+msgid "photo"
+msgstr "fotografie"
+
+#: rapid/rapid.py:2872
+#, python-format
+msgid "%(noFiles)s %(filetypes)s downloaded"
+msgstr "%(noFiles)s %(filetypes)s descărcate"
+
+#: rapid/rapid.py:2876
+#, python-format
+msgid "%(noFiles)s %(filetypes)s failed to download"
+msgstr "%(noFiles)s %(filetypes)s descărcare eșuată"
+
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
+msgid "warnings"
+msgstr "avertismente"
+
+#: rapid/rapid.py:2892
+msgid "All downloads complete"
+msgstr "Toate descărcările complecte"
+
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
+#, python-format
+msgid "%(number)s %(numberdownloaded)s"
+msgstr "%(number)s %(numberdownloaded)s"
+
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
+#, python-format
+msgid "%(filetype)s downloaded"
+msgstr "%(filetype)s descărcate"
+
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
+#, python-format
+msgid "%(filetype)s failed to download"
+msgstr "%(filetype)s au eşuat la descărcare"
+
+#. e.g.: 3 of 205 photos and videos (202 remaining)
+#: rapid/rapid.py:2970
+#, python-format
+msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
+msgstr "%(number)s din %(total)s %(filetypes)s (%(remaining)s remaining)"
+
+#. e.g.: 205 of 205 photos and videos
+#: rapid/rapid.py:2977
+#, python-format
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr "%(number)s din %(total)s %(filetypes)s"
+
+#: rapid/rapid.py:3331
+msgid "From"
+msgstr ""
+
+#: rapid/rapid.py:3339
+msgid "Auto Detect"
+msgstr ""
+
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
+#, python-format
+msgid "Select a folder containing %(file_types)s"
+msgstr "Selectaţi un dosar ce conţine %(file_types)s"
+
+#: rapid/rapid.py:3384
+msgid "Copy"
+msgstr ""
+
+#: rapid/rapid.py:3397
+msgid "Move"
+msgstr ""
+
+#: rapid/rapid.py:3419
+msgid "To"
+msgstr ""
+
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
+msgid "Photos:"
+msgstr "Fotografii:"
+
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
+msgid "Select a folder to download photos to"
+msgstr "Alegeți un dosar unde să fie descărcate fotografiile"
+
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
+msgid "Videos:"
+msgstr "Video-uri"
+
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
+msgid "Select a folder to download videos to"
+msgstr "Selectează un dosar unde descarc video"
+
+#: rapid/rapid.py:3650
+msgid "and"
+msgstr "și"
+
+#: rapid/rapid.py:3655
+msgid "Using backup devices"
+msgstr "Folosesc copia de siguranță a dispozitivelor"
+
+#: rapid/rapid.py:3657
+msgid "Using backup device"
+msgstr "Folosesc copia de siguranță a dispozitivului"
+
+#: rapid/rapid.py:3659
+msgid "No backup devices detected"
+msgstr "Nu am găsit copie de siguranță a dispozitivului"
+
+#: rapid/rapid.py:3686
 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:2256
+#: rapid/rapid.py:3698
 #, 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:2260
+#: rapid/rapid.py:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr ""
@@ -115,43 +298,87 @@ msgstr ""
 #. Inserted in the middle of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:2265
+#: rapid/rapid.py:3707
 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:2270
+#: rapid/rapid.py:3712
 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:2276
+#: rapid/rapid.py:3718
 #, python-format
 msgid "%(free)s free"
 msgstr ""
 
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3726
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
+msgstr ""
+
 #. user manually specified backup location
-#: rapid/rapid.py:2282
+#: rapid/rapid.py:3729
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Copiez de siguranță în %(path)s"
 
-#: rapid/rapid.py:2287
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3732
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr ""
+
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:2470
+#: rapid/rapid.py:3768
+msgid "Program preferences are invalid"
+msgstr ""
+
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
+msgid "Photo"
+msgstr "Fotografie"
+
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
+msgid "Video"
+msgstr "Video"
+
+#: rapid/rapid.py:3921
+#, python-format
+msgid "%(file_type)s download folder does not exist"
+msgstr ""
+
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
+#, python-format
+msgid "Folder: %s"
+msgstr ""
+
+#: rapid/rapid.py:3935
+#, python-format
+msgid "%(file_type)s download folder is invalid"
+msgstr ""
+
+#: rapid/rapid.py:3948
+#, python-format
+msgid "%(file_type)s download folder is not writable"
+msgstr ""
+
+#: rapid/rapid.py:4034
 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:2511
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -160,55 +387,110 @@ msgstr ""
 "afișare informații program în linia de comandă când programul rulează "
 "(default: %default)"
 
-#: rapid/rapid.py:2512
+#: rapid/rapid.py:4090
 msgid "display debugging information when run from the command line"
 msgstr "afișare informații depanare în linia de coandă atunci când rulează"
 
-#: rapid/rapid.py:2513
+#: rapid/rapid.py:4091
 msgid "only output errors to the command line"
 msgstr "doar erorile de ieșire în linie de comandă"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:2515
+#: rapid/rapid.py:4093
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 "listează extensiile fișierului fotografie și video pe care progamul le "
 "recunoaște și ieși"
 
-#: rapid/rapid.py:2516
+#: rapid/rapid.py:4095
+msgid ""
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
+msgstr ""
+
+#: rapid/rapid.py:4096
+msgid ""
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
+msgstr ""
+
+#: rapid/rapid.py:4097
 msgid "reset all program settings and preferences and exit"
 msgstr "resetează toate setările și preferințele și ieși"
 
-#: rapid/rapid.py:2529
-msgid "Photos:"
-msgstr "Fotografii:"
-
-#: rapid/rapid.py:2529
-msgid "Videos:"
-msgstr "Video-uri"
+#: rapid/rapid.py:4110
+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:2534
+#: rapid/rapid.py:4133
 #, python-format
 msgid "and %s"
 msgstr "și %s"
 
-#: rapid/rapid.py:2542
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
 msgstr "Toate setările și preferințele au fost resetate"
 
-#: rapid/rapid.py:2551
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
+msgid "Backing up error"
+msgstr "Eroare copiere de siguranță"
+
+#: rapid/backupfile.py:151
+#, python-format
+msgid "Destination directory could not be created: %(directory)s\n"
+msgstr "Directorul de destinație nu poate fi creat: %(directory)s\n"
+
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
+#, python-format
 msgid ""
-"Video downloading functionality disabled.\n"
-"To download videos, please install the hachoir metadata and kaa metadata "
-"packages for python."
+"Source: %(source)s\n"
+"Destination: %(destination)s"
 msgstr ""
+"Sursă: %(source)s\n"
+"Destinație: %(destination)s"
+
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
+#, python-format
+msgid "Error: %(inst)s"
+msgstr "Erori: %(inst)s"
 
-#: rapid/device.py:79
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr "Copia de siguranță %(file_type)s va fi rescrisă"
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr "%(file_type)s nu s-a copiat de siguranță"
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr "Copia de siguranță a %(file_type)s există deja"
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
+#, python-format
+msgid ""
+"%(problem)s\n"
+"File: %(file)s"
+msgstr ""
+
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr ""
+
+#: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Dispozitiv Detectat"
 
 #. 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 ""
@@ -216,436 +498,491 @@ msgstr ""
 "fotografii sau video de la?"
 
 #. 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 "_Amintiţi-vă această alegere"
 
-#: rapid/generatenameconfig.py:143
+#: rapid/downloadtracker.py:299
+msgid "MB/s"
+msgstr "MB/s"
+
+#: rapid/generatenameconfig.py:151
 msgid "Date time"
 msgstr "Dată timp"
 
-#: rapid/generatenameconfig.py:144
+#: rapid/generatenameconfig.py:152
 msgid "Text"
 msgstr "Text"
 
-#: rapid/generatenameconfig.py:145
+#: rapid/generatenameconfig.py:153
 msgid "Filename"
 msgstr "Nume fișier"
 
-#: rapid/generatenameconfig.py:146
+#: rapid/generatenameconfig.py:154
 msgid "Metadata"
 msgstr "Metadata"
 
-#: rapid/generatenameconfig.py:147
+#: rapid/generatenameconfig.py:155
 msgid "Sequences"
 msgstr "Secvenţe"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/generatenameconfig.py:149 rapid/preferencesdialog.py:545
+#: rapid/generatenameconfig.py:157 rapid/preferencesdialog.py:577
 msgid "Job code"
 msgstr "Cod sarcină"
 
-#: rapid/generatenameconfig.py:150
+#: rapid/generatenameconfig.py:158
 msgid "Image date"
 msgstr "Dată imagine"
 
-#: rapid/generatenameconfig.py:151
+#: rapid/generatenameconfig.py:159
 msgid "Video date"
 msgstr "Dată video"
 
-#: rapid/generatenameconfig.py:152
+#: rapid/generatenameconfig.py:160
 msgid "Today"
 msgstr "Astăzi"
 
-#: rapid/generatenameconfig.py:153
+#: 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:155
+#: rapid/generatenameconfig.py:163
 msgid "Download time"
 msgstr "Timp descărcare"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:157
+#: rapid/generatenameconfig.py:165
 msgid "Name + extension"
 msgstr "Nume + extensie"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:159
+#: rapid/generatenameconfig.py:167
 msgid "Name"
 msgstr "Nume"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:161
+#: rapid/generatenameconfig.py:169
 msgid "Extension"
 msgstr "Extensie"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:163
+#: rapid/generatenameconfig.py:171
 msgid "Image number"
 msgstr "Număr imagine"
 
-#: rapid/generatenameconfig.py:164
+#: rapid/generatenameconfig.py:172
 msgid "Video number"
 msgstr "Număr video"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:166
+#: rapid/generatenameconfig.py:174
 msgid "Aperture"
 msgstr "Diafragmă"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:168
+#: 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:170
+#: rapid/generatenameconfig.py:178
 msgid "Exposure time"
 msgstr "Timp expunere"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:172
+#: rapid/generatenameconfig.py:180
 msgid "Focal length"
 msgstr "Distanță focală"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:174
+#: rapid/generatenameconfig.py:182
 msgid "Camera make"
 msgstr "Fabricant cameră foto"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:176
+#: rapid/generatenameconfig.py:184
 msgid "Camera model"
 msgstr "Model cameră foto"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:178
+#: rapid/generatenameconfig.py:186
 msgid "Short camera model"
 msgstr "Model scurt cameră foto"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:180
+#: rapid/generatenameconfig.py:188
 msgid "Hyphenated short camera model"
 msgstr "Silabisire scurtă model cameră foto"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:182
+#: rapid/generatenameconfig.py:190
 msgid "Serial number"
 msgstr "Număr serie"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:184
+#: rapid/generatenameconfig.py:192
 msgid "Shutter count"
 msgstr "Calcul obturator"
 
+#. File number currently refers to the Exif value Exif.Canon.FileNumber
+#: rapid/generatenameconfig.py:194
+msgid "File number"
+msgstr ""
+
+#. Only the folder component of the Exif.Canon.FileNumber value
+#: rapid/generatenameconfig.py:196
+msgid "Folder only"
+msgstr ""
+
+#. The folder and file component of the Exif.Canon.FileNumber value
+#: rapid/generatenameconfig.py:198
+msgid "Folder and file"
+msgstr ""
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:186
+#: rapid/generatenameconfig.py:200
 msgid "Owner name"
 msgstr "Nume proprietar"
 
-#: rapid/generatenameconfig.py:187
+#: rapid/generatenameconfig.py:201
 msgid "Codec"
 msgstr "Codec"
 
-#: rapid/generatenameconfig.py:188
+#: rapid/generatenameconfig.py:202
 msgid "Width"
 msgstr "Lățime"
 
-#: rapid/generatenameconfig.py:189
+#: rapid/generatenameconfig.py:203
 msgid "Height"
 msgstr "Înălțime"
 
-#: rapid/generatenameconfig.py:190
+#: rapid/generatenameconfig.py:204
 msgid "Length"
 msgstr "Lungime"
 
-#: rapid/generatenameconfig.py:191
+#: rapid/generatenameconfig.py:205
 msgid "Frames Per Second"
 msgstr "Cadre pe secundă"
 
+#: rapid/generatenameconfig.py:206
+msgid "Artist"
+msgstr ""
+
+#: 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:193
+#: rapid/generatenameconfig.py:209
 msgid "Downloads today"
 msgstr "Descărcările de azi"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:195
+#: rapid/generatenameconfig.py:211
 msgid "Session number"
 msgstr "Numărul sesiunii"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:197
+#: rapid/generatenameconfig.py:213
 msgid "Subfolder number"
 msgstr "Număr subdosare"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:199
+#: rapid/generatenameconfig.py:215
 msgid "Stored number"
 msgstr "Număr stocare"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/generatenameconfig.py:201
+#: rapid/generatenameconfig.py:217
 msgid "Sequence letter"
 msgstr "Secvență literă"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:203
+#: rapid/generatenameconfig.py:219
 msgid "All digits"
 msgstr "Toți digiți"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:205
+#: rapid/generatenameconfig.py:221
 msgid "Last digit"
 msgstr "Ultimul digit"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:207
+#: rapid/generatenameconfig.py:223
 msgid "Last 2 digits"
 msgstr "Ultimii 2 digiți"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:209
+#: rapid/generatenameconfig.py:225
 msgid "Last 3 digits"
 msgstr "Ultimii 3 digiți"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:211
+#: rapid/generatenameconfig.py:227
 msgid "Last 4 digits"
 msgstr "Ultimii 4 digiți"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:213
+#: rapid/generatenameconfig.py:229
 msgid "Original Case"
 msgstr "Format original"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:215
+#: rapid/generatenameconfig.py:231
 msgid "UPPERCASE"
 msgstr "MAJUSCULE"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:217
+#: rapid/generatenameconfig.py:233
 msgid "lowercase"
 msgstr "minuscule"
 
-#: rapid/generatenameconfig.py:218
+#: rapid/generatenameconfig.py:234
 msgid "One digit"
 msgstr "Un digit"
 
-#: rapid/generatenameconfig.py:219
+#: rapid/generatenameconfig.py:235
 msgid "Two digits"
 msgstr "Doi digiți"
 
-#: rapid/generatenameconfig.py:220
+#: rapid/generatenameconfig.py:236
 msgid "Three digits"
 msgstr "Trei digiți"
 
-#: rapid/generatenameconfig.py:221
+#: rapid/generatenameconfig.py:237
 msgid "Four digits"
 msgstr "Patru digiți"
 
-#: rapid/generatenameconfig.py:222
+#: rapid/generatenameconfig.py:238
 msgid "Five digits"
 msgstr "Cinci digiți"
 
-#: rapid/generatenameconfig.py:223
+#: rapid/generatenameconfig.py:239
 msgid "Six digits"
 msgstr "Șase digiți"
 
-#: rapid/generatenameconfig.py:224
+#: rapid/generatenameconfig.py:240
 msgid "Seven digits"
 msgstr "Șapte digiți"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:226
+#: rapid/generatenameconfig.py:242
 msgid "Subseconds"
 msgstr "Milisecunde"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:228
+#: rapid/generatenameconfig.py:244
 msgid "YYYYMMDD"
 msgstr "AAAALLZZ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:230
+#: rapid/generatenameconfig.py:246
 msgid "YYYY-MM-DD"
 msgstr "AAAA-LL-ZZ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:232
+#: rapid/generatenameconfig.py:248
 msgid "YYMMDD"
 msgstr "AALLZZ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:234
+#: rapid/generatenameconfig.py:250
 msgid "YY-MM-DD"
 msgstr "AA-LL-ZZ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:236
+#: rapid/generatenameconfig.py:252
 msgid "MMDDYYYY"
 msgstr "LLZZAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:238
+#: rapid/generatenameconfig.py:254
 msgid "MMDDYY"
 msgstr "LLZZAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:240
+#: rapid/generatenameconfig.py:256
 msgid "MMDD"
 msgstr "LLZZ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:242
+#: rapid/generatenameconfig.py:258
 msgid "DDMMYYYY"
 msgstr "ZZLLAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:244
+#: rapid/generatenameconfig.py:260
 msgid "DDMMYY"
 msgstr "ZZLLAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:246
+#: 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:248
+#: 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:250
+#: rapid/generatenameconfig.py:266
 msgid "MM"
 msgstr "LL"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:252
+#: rapid/generatenameconfig.py:268
 msgid "DD"
 msgstr "ZZ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:254
+#: 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 "OOMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:256
+#: rapid/generatenameconfig.py:276
 msgid "HHMM"
 msgstr "OOMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:258
+#: rapid/generatenameconfig.py:278
 msgid "HH-MM-SS"
 msgstr "OO-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:260
+#: rapid/generatenameconfig.py:280
 msgid "HH-MM"
 msgstr "OO-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:262
+#: rapid/generatenameconfig.py:282
 msgid "HH"
 msgstr "OO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:264
+#: rapid/generatenameconfig.py:284
 msgid "MM (minutes)"
 msgstr "MM (minute)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:266
+#: rapid/generatenameconfig.py:286
 msgid "SS"
 msgstr "SS"
 
-#: rapid/preferencesdialog.py:364
+#: rapid/preferencesdialog.py:374
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Preferințele subdosarului nu se poate începe cu %s"
 
-#: rapid/preferencesdialog.py:366
+#: rapid/preferencesdialog.py:376
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Preferințele subdosarului nu se pot termina cu %s"
 
-#: rapid/preferencesdialog.py:370
+#: rapid/preferencesdialog.py:380
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 "Preferințele subdosarului nu trebuie să conțină două %s una după alta"
 
-#: rapid/preferencesdialog.py:384 rapid/preferencesdialog.py:668
+#: rapid/preferencesdialog.py:439 rapid/preferencesdialog.py:700
 msgid "Remove all Job Codes?"
 msgstr "Eliminați toate Codurile Sarcină"
 
-#: rapid/preferencesdialog.py:401 rapid/preferencesdialog.py:685
+#: rapid/preferencesdialog.py:440 rapid/preferencesdialog.py:717
 msgid "Should all Job Codes be removed?"
 msgstr "Să elimin toate Codurile Sarcină"
 
-#: rapid/preferencesdialog.py:431
+#: rapid/preferencesdialog.py:446
+msgid "Remove all Remembered Paths?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:447
+msgid "Should all remembered paths be removed?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:453
+msgid "Remove all Ignored Paths?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:454
+msgid "Should all ignored paths be removed?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:465
 msgid "Error in Photo Rename preferences"
 msgstr "Eroare în preferințele redenumirii fotografiei"
 
-#: rapid/preferencesdialog.py:613
+#: rapid/preferencesdialog.py:645
 msgid "Error in Video Rename preferences"
 msgstr "Eroare în preferințele redenumirii fișierului video"
 
-#: rapid/preferencesdialog.py:634
+#: rapid/preferencesdialog.py:666
 msgid "Error in Photo Download Subfolders preferences"
 msgstr "Eroare în preferințe Subdosar Descărcări Foto"
 
-#: rapid/preferencesdialog.py:651
+#: rapid/preferencesdialog.py:683
 msgid "Error in Video Download Subfolders preferences"
 msgstr "Eroare în preferințe Subdosar Descărcări Video"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:710
+#: rapid/preferencesdialog.py:742
 msgid "Enter a Job Code"
 msgstr "Introduceți un Cod Sarcină"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:727
+#: rapid/preferencesdialog.py:758
 msgid "Enter a new Job Code, or select a previous one"
 msgstr "Introduceți un nou Cod Sarcină, sau selectați unul precedent"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:730
+#: rapid/preferencesdialog.py:761
 msgid "Enter a new Job Code"
 msgstr "Introduceți un nou Cod Sarcină"
 
-#: rapid/preferencesdialog.py:735
+#: rapid/preferencesdialog.py:766
 msgid "Job Code:"
 msgstr "Cod Sarcină"
 
-#: rapid/preferencesdialog.py:815 rapid/rpdfile.py:108
-msgid "photos and videos"
-msgstr "fotografii și video"
+#: rapid/preferencesdialog.py:822
+msgid "Enter a Path to Ignore"
+msgstr ""
 
-#: rapid/preferencesdialog.py:964
-msgid "Select a folder to download photos to"
-msgstr "Alegeți un dosar unde să fie descărcate fotografiile"
+#: rapid/preferencesdialog.py:834
+msgid "Specify a path that will never be scanned for photos or videos"
+msgstr ""
 
-#: rapid/preferencesdialog.py:982
-msgid "Select a folder to download videos to"
-msgstr "Selectează un dosar unde descarc video"
+#: rapid/preferencesdialog.py:839
+msgid "Path:"
+msgstr ""
 
-#: rapid/preferencesdialog.py:1064
-#, python-format
-msgid "Select a folder containing %(file_types)s"
-msgstr "Selectaţi un dosar ce conţine %(file_types)s"
+#: rapid/preferencesdialog.py:1092
+msgid "Job Code"
+msgstr "Cod Sarcină"
 
-#: rapid/preferencesdialog.py:1086
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
-msgstr "Selectați un dosar unde faceți o copie de siguranță a %(file_types)s"
+#: rapid/preferencesdialog.py:1363
+msgid "Select a folder in which to backup photos"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1376
+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:1172
+#: rapid/preferencesdialog.py:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -653,7 +990,7 @@ msgstr ""
 "<i><b>Avertivare:</b> Nu există suficiente metadate pentru a genera pe "
 "deplin numele. Folosiţi alte opţiuni de redenumire.</i>"
 
-#: rapid/preferencesdialog.py:1211
+#: rapid/preferencesdialog.py:1524
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -662,13 +999,13 @@ msgstr ""
 "subdosarului. Folosiți opțiunea de denumire.</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:1215
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Exemple: %s<i/>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1291
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -679,402 +1016,451 @@ msgstr ""
 "folosite.\n"
 "Ele vor fi resetate la valori implicte."
 
-#. check subfolder preferences for bad values
-#: rapid/preferencesdialog.py:1305 rapid/rpdfile.py:120 rapid/rpdfile.py:241
-msgid "photo"
-msgstr "fotografie"
+#: rapid/preferencesdialog.py:1762
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
 
-#: rapid/preferencesdialog.py:1306 rapid/rpdfile.py:115 rapid/rpdfile.py:267
-msgid "video"
-msgstr "video"
+#: rapid/preferencesdialog.py:1764
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1765
+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:1566
+#: rapid/preferencesdialog.py:1949
 msgid "externaldrive1"
 msgstr "dispozitiv extern 1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1568
+#: rapid/preferencesdialog.py:1951
 msgid "externaldrive2"
 msgstr "dispozitiv extern 2"
 
-#: rapid/prefsrapid.py:122
+#: rapid/prefsrapid.py:127
 msgid "New York"
 msgstr "New York"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:128
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:128
 msgid "Prague"
 msgstr "Praga"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:128
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:128
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:129
 msgid "Tehran"
 msgstr "Teheran"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:129
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:129
 msgid "Paris"
 msgstr "Paris"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:129
 msgid "Berlin"
 msgstr "Berlin"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:129
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:130
 msgid "Budapest"
 msgstr "Budapesta"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:130
 msgid "Rome"
 msgstr "Roma"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:130
 msgid "Moscow"
 msgstr "Moscova"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:130
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:130
 msgid "Warsaw"
 msgstr "Varșovia"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:131
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:131
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:131
 msgid "Stockholm"
 msgstr "Stockholm"
 
 #. components
-#: rapid/problemnotification.py:26 rapid/subfolderfile.py:181
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
 msgstr "subdosar"
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:179
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr "nume fișier"
 
-#: rapid/problemnotification.py:80
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr ""
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:86
 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:88
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr ""
 
 #. a generic problem
-#: rapid/problemnotification.py:86
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr ""
 
-#: rapid/problemnotification.py:88
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr ""
 
-#: rapid/problemnotification.py:90 rapid/problemnotification.py:91
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr ""
 
-#: rapid/problemnotification.py:93 rapid/problemnotification.py:94
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr ""
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr ""
 
-#: rapid/problemnotification.py:97
+#: rapid/problemnotification.py:105
 #, 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:110
 #, python-format
 msgid ""
-"%(image1)s was taken at on %(image1_date)s at %(image1_time)s, and "
-"%(image2)s on %(image2_date)s at %(image2_time)s."
+"%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
+"on %(image2_date)s at %(image2_time)s."
 msgstr ""
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr ""
 
-#: rapid/problemnotification.py:107
+#: rapid/problemnotification.py:115
 #, 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:116
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:117
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr ""
 
-#: rapid/problemnotification.py:111
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr ""
 
-#: rapid/problemnotification.py:201
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr ""
 
-#: rapid/problemnotification.py:204
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
 msgstr ""
 
-#: rapid/problemnotification.py:223
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr ""
 
-#: rapid/problemnotification.py:225
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr ""
 
-#: rapid/problemnotification.py:227 rapid/problemnotification.py:288
-#: rapid/problemnotification.py:300
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr ""
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:240
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
 "%(details)s"
 msgstr ""
 
-#: rapid/problemnotification.py:257
+#: rapid/problemnotification.py:269
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr ""
 
-#: rapid/problemnotification.py:259
+#: rapid/problemnotification.py:271
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:261
+#: rapid/problemnotification.py:273
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr ""
 
-#: rapid/problemnotification.py:265 rapid/problemnotification.py:313
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr ""
 
-#: rapid/problemnotification.py:267
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr ""
 
-#: rapid/problemnotification.py:271 rapid/problemnotification.py:315
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr ""
 
-#: rapid/problemnotification.py:276
+#: rapid/problemnotification.py:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:284
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:286
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr ""
 
-#: rapid/problemnotification.py:296
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:298
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr ""
 
-#: rapid/problemnotification.py:309
+#: rapid/problemnotification.py:321
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr ""
 
-#: rapid/problemnotification.py:311
+#: rapid/problemnotification.py:323
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 
-#: rapid/problemnotification.py:322
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr ""
 
-#: rapid/problemnotification.py:330
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr ""
 
-#: rapid/problemnotification.py:332
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr ""
 
-#: rapid/problemnotification.py:341
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: rapid/problemnotification.py:343
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr ""
 
-#: rapid/problemnotification.py:346
+#: rapid/problemnotification.py:371
 #, python-format
 msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr ""
 
-#: rapid/problemnotification.py:363
+#: rapid/problemnotification.py:388
 msgid "Problems in subfolder and filename generation"
 msgstr ""
 
-#: rapid/problemnotification.py:365
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr ""
 
-#: rapid/problemnotification.py:368
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr ""
 
-#: rapid/problemnotification.py:370
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr ""
 
-#: rapid/problemnotification.py:379
+#: rapid/problemnotification.py:404
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr ""
 
-#: rapid/problemnotification.py:381
+#: rapid/problemnotification.py:406
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 
-#: rapid/problemnotification.py:401
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr ""
 
-#: rapid/problemnotification.py:403
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 "Fotografii detectate cu același nume de fișier, dar făcute în timpi diferiți"
 
-#: rapid/problemnotification.py:409
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr ""
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr ""
 
-#: rapid/problemnotification.py:412
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr ""
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr ""
 
 #. e.g.
-#: rapid/problemnotification.py:416
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr ""
 
-#: rapid/rpdfile.py:110
-msgid "photos or videos"
-msgstr "fotografii și video"
-
-#: rapid/rpdfile.py:134
+#: rapid/rpdfile.py:159
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/rpdfile.py:242
-msgid "Photo"
-msgstr "Fotografie"
+#: rapid/rpdfile.py:169
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
+msgstr ""
 
-#: rapid/rpdfile.py:268
-msgid "Video"
-msgstr "Video"
+#: rapid/subfolderfile.py:81
+#, python-format
+msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:177
+#: rapid/subfolderfile.py:325
 msgid "subfolder and filename"
 msgstr "subdosare si nume fișiere"
 
+#: rapid/subfolderfile.py:406
+msgid "Photo has already been downloaded"
+msgstr "Fotografia este deja descărcată"
+
+#: rapid/subfolderfile.py:407
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Sursă: %(source)s"
+
+#: rapid/subfolderfile.py:485
+msgid "Failed to create download subfolder"
+msgstr ""
+
+#: rapid/subfolderfile.py:486
+#, python-format
+msgid "Path: %s"
+msgstr ""
+
 #: rapid/glade3/rapid.ui.h:1
 msgid "About..."
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:2
-msgid "Check All"
+msgid "_Check All"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:3
@@ -1086,403 +1472,393 @@ msgid "Check All Videos"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:5
-msgid "Download / Pause"
-msgstr "Descărcare / Pauză"
-
-#: rapid/glade3/rapid.ui.h:6
-msgid "Get Help Online..."
-msgstr ""
+msgid "_Make a Donation..."
+msgstr "_Faceți o Donație..."
 
 #: rapid/glade3/rapid.ui.h:7
-msgid "Make a Donation..."
-msgstr ""
+msgid "_Get Help Online..."
+msgstr "_Găsiți Ajutor Online..."
 
 #: rapid/glade3/rapid.ui.h:8
-msgid "Next File"
+msgid "Help"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:9
-msgid "Previous File"
+msgid "Preferences"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:10
 msgid "Quit"
 msgstr ""
 
-#: rapid/glade3/rapid.ui.h:12
+#: rapid/glade3/rapid.ui.h:11
 msgid "Refresh"
 msgstr ""
 
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr "_Raportați o problemă..."
+
 #: rapid/glade3/rapid.ui.h:13
-msgid "Report a Problem..."
+msgid "Translate this Application..."
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:14
-msgid "Select All Wit_h Job Code"
-msgstr "Selectați tot c_u Cod Sarcină"
-
-#: rapid/glade3/rapid.ui.h:15
-msgid "Select All Without _Job Code"
-msgstr "Selectați tot fără _Cod Sarcină"
+msgid "_Uncheck All"
+msgstr ""
 
 #: rapid/glade3/rapid.ui.h:16
-msgid "Translate this Application..."
-msgstr ""
+msgid "_File"
+msgstr "_Fişier"
 
 #: rapid/glade3/rapid.ui.h:17
-msgid "Uncheck All"
-msgstr ""
+msgid "Download / Pause"
+msgstr "Descărcare / Pauză"
 
 #: rapid/glade3/rapid.ui.h:18
-msgid "_Check All"
-msgstr ""
+msgid "_Select"
+msgstr "_Selectați"
 
 #: rapid/glade3/rapid.ui.h:19
-msgid "_Clear Completed Downloads"
-msgstr "_Curăță descărcările Complected"
+msgid "Select All Without _Job Code"
+msgstr "Selectați tot fără _Cod Sarcină"
 
 #: rapid/glade3/rapid.ui.h:20
-msgid "_Download"
-msgstr ""
+msgid "Select All Wit_h Job Code"
+msgstr "Selectați tot c_u Cod Sarcină"
 
 #: rapid/glade3/rapid.ui.h:21
-msgid "_Error Log"
-msgstr "_Erori Jurnal"
+msgid "_View"
+msgstr "_Vizualizează"
 
 #: rapid/glade3/rapid.ui.h:22
-msgid "_File"
-msgstr "_Fişier"
+msgid "_Error Log"
+msgstr "_Erori Jurnal"
 
 #: rapid/glade3/rapid.ui.h:23
-msgid "_Help"
-msgstr "_Ajutor"
+msgid "_Clear Completed Downloads"
+msgstr "_Curăță descărcările Complected"
 
 #: rapid/glade3/rapid.ui.h:24
-msgid "_Include in download"
+msgid "Previous File"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:25
-msgid "_Make a Donation..."
-msgstr "_Faceți o Donație..."
+msgid "Next File"
+msgstr ""
 
 #: rapid/glade3/rapid.ui.h:26
-msgid "_Select"
-msgstr "_Selectați"
+msgid "_Help"
+msgstr "_Ajutor"
 
 #: rapid/glade3/rapid.ui.h:27
 msgid "_Translate this Application..."
 msgstr "_Tradu această aplicație..."
 
 #: rapid/glade3/rapid.ui.h:28
-msgid "_Uncheck All"
+msgid "_Include in download"
 msgstr ""
 
 #: rapid/glade3/rapid.ui.h:29
-msgid "_View"
-msgstr "_Vizualizează"
+msgid "_Download"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:1
-msgid " "
-msgstr " "
+msgid "Preferences: Rapid Photo Downloader"
+msgstr "Preferințe: Rapid Foto Descărcător"
 
 #: rapid/glade3/prefs.ui.h:2
-msgid " hh:mm"
-msgstr " oo:mm"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Dosar Descărcări Fotografii</span>"
 
 #: rapid/glade3/prefs.ui.h:3
-msgid ":"
-msgstr ":"
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr "<i>Exemplu: /acasă/utilizator/Poze</i>"
 
 #: rapid/glade3/prefs.ui.h:4
-msgid "<b>Backup</b>"
-msgstr "Copie de rezervă"
+msgid "<b>Download Subfolders</b>"
+msgstr "<b>Subdosar Descărcări</b>"
 
 #: rapid/glade3/prefs.ui.h:5
-msgid "<b>Compatibility with Other Operating Systems</b>"
-msgstr "<b>Compatibilitate cu Alt Sistem de Operare</b>"
+msgid "Download folder:"
+msgstr "Dosarul de descărcare:"
 
 #: rapid/glade3/prefs.ui.h:6
-msgid "<b>Devices</b>"
-msgstr "<b>Dispozitiv</b>"
+msgid ""
+"Choose the download folder. Subfolders for the downloaded photos will be "
+"automatically created in this folder using the structure specified below."
+msgstr ""
+"Alegeți dosarul de descărcări. Subdosarul pentru fotografiile descărcate va "
+"fi creat automat în acest dosar folosind structura de mai jos."
 
 #: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Folder</b>"
 msgstr "<b>Dosar Descărcare</b>"
 
 #: rapid/glade3/prefs.ui.h:8
-msgid "<b>Download Subfolders</b>"
-msgstr "<b>Subdosar Descărcări</b>"
+msgid "Photo Folders"
+msgstr "Dosar Fotografii"
 
 #: rapid/glade3/prefs.ui.h:9
-msgid "<b>Example</b>"
-msgstr "<b>Exemplu</b>"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Redenumire Fotografii</span>\t"
 
 #: rapid/glade3/prefs.ui.h:10
-msgid "<b>Job Codes</b>"
-msgstr "<b>Cod Sarcină</b>"
-
-#: rapid/glade3/prefs.ui.h:11
 msgid "<b>Photo Rename</b>"
 msgstr "<b>Redenumire Fotografie</b>"
 
+#: rapid/glade3/prefs.ui.h:11
+msgid " "
+msgstr " "
+
 #: rapid/glade3/prefs.ui.h:12
-msgid "<b>Photo and Video Name Conflicts</b>"
-msgstr "<b>Conflicte în Nume Fotografii și Video</b>"
+msgid "<i>New:</i>"
+msgstr "<i>Nou:</i>"
 
 #: rapid/glade3/prefs.ui.h:13
-msgid "<b>Program Automation</b>"
-msgstr "<b>Program Automatizare</b>"
+msgid "<i>Original:</i>"
+msgstr "<i>Original:</i>"
 
 #: rapid/glade3/prefs.ui.h:14
-msgid "<b>Sequence Numbers</b>"
-msgstr "<b>Număr Secvență</b>"
+msgid "<b>Example</b>"
+msgstr "<b>Exemplu</b>"
 
 #: rapid/glade3/prefs.ui.h:15
-msgid "<i>/media/externaldrive/Photos</i>"
-msgstr "<i>/media/dispozitiv extern/Fotografii</i>"
+msgid "Photo Rename"
+msgstr "Redenumire Fotografie"
 
 #: rapid/glade3/prefs.ui.h:16
-msgid "<i>Example: /home/user/Pictures</i>"
-msgstr "<i>Exemplu: /acasă/utilizator/Poze</i>"
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Dosar Descărcări Video</span>"
 
 #: rapid/glade3/prefs.ui.h:17
-msgid "<i>Example:</i>"
-msgstr "<i>Exemplu:</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 ""
 
 #: rapid/glade3/prefs.ui.h:18
-msgid "<i>New:</i>"
-msgstr "<i>Nou:</i>"
+msgid ""
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
+msgstr ""
+"Alegeți dosarul de descărcări. Subdosarul pentru video descărcate va fi "
+"creat automat în acest dosar folosind structura de mai jos."
 
 #: rapid/glade3/prefs.ui.h:19
-msgid "<i>Original:</i>"
-msgstr "<i>Original:</i>"
+msgid "Video Folders"
+msgstr "Dosare Video"
 
 #: rapid/glade3/prefs.ui.h:20
-msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">Copie de Rezervă</span>\t"
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Redenumire Video</span>\t"
 
 #: rapid/glade3/prefs.ui.h:21
-msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
-msgstr ""
-"Copy text \t\r\n"
-"<span weight=\"bold\" size=\"x-large\">Dispozitiv</span>"
+msgid "Video Rename"
+msgstr "Redenumire Video"
 
 #: rapid/glade3/prefs.ui.h:22
-msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Eroare de manipulare</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Redenumire Opțiuni</span>"
 
 #: rapid/glade3/prefs.ui.h:23
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Coduri Sarcină</span>"
+msgid "<b>Sequence Numbers</b>"
+msgstr "<b>Număr Secvență</b>"
 
 #: rapid/glade3/prefs.ui.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
+msgid ""
+"Specify the time in 24 hour format at which the <i>Downloads today</i> "
+"sequence number should be reset."
 msgstr ""
+"Specificaţi ora în formatul de 24 de ore la care <i>Descărcări de astăzi</i> "
+"numărul de ordine ar fi resetate."
 
 #: rapid/glade3/prefs.ui.h:25
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Dosar Descărcări Fotografii</span>"
+msgid "Day start:"
+msgstr "Ziua de început:"
 
 #: rapid/glade3/prefs.ui.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
-msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Redenumire Fotografii</span>\t"
+msgid "Downloads today:"
+msgstr "Descărcări de azi:"
 
 #: rapid/glade3/prefs.ui.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Redenumire Opțiuni</span>"
+msgid "Stored number:"
+msgstr "Număr stocare:"
 
 #: rapid/glade3/prefs.ui.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Dosar Descărcări 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\">Redenumire Video</span>\t"
+msgid " hh:mm"
+msgstr " oo:mm"
 
 #: rapid/glade3/prefs.ui.h:30
-msgid "Add unique identifier"
-msgstr "Adaugă identificator unic"
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "Sincronizarea RAW + JPEG numere de secvenţă"
 
 #: rapid/glade3/prefs.ui.h:31
-msgid "Automatically detect Portable Storage Devices"
-msgstr "Detectare automată a Dispozitivelor de Stocare Portabile"
+msgid "<b>Compatibility with Other Operating Systems</b>"
+msgstr "<b>Compatibilitate cu Alt Sistem de Operare</b>"
 
 #: rapid/glade3/prefs.ui.h:32
-msgid "Automatically detect backup devices"
-msgstr "Detectare automată a copiilor de siguranță a dispozitivelor"
+msgid ""
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
+msgstr ""
+"Specificaţi dacă foto, video şi nume de dosar ar trebui să aibă caractere "
+"eliminate care nu sunt permise de alte sisteme de operare."
 
 #: rapid/glade3/prefs.ui.h:33
-msgid "Automatically detect devices"
-msgstr "Detectare automată dispozitive"
+msgid "Strip incompatible characters"
+msgstr "Curăță caractere incompatibile"
 
 #: rapid/glade3/prefs.ui.h:34
-msgid "Backup"
-msgstr "Copie de rezervă"
+msgid "Rename Options"
+msgstr "Opțiuni Redenumire"
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup location:"
-msgstr "Locație copie de rezervă"
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Coduri Sarcină</span>"
 
 #: rapid/glade3/prefs.ui.h:36
-msgid "Backup photos and videos when downloading"
-msgstr "Copiază de siguranță fotografiile șî video cănd descărci"
+msgid "<b>Job Codes</b>"
+msgstr "<b>Cod Sarcină</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 ""
-"Alegeți dosarul de descărcări. Subdosarul pentru fotografiile descărcate va "
-"fi creat automat în acest dosar folosind structura de mai jos."
-
-#: 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 ""
-"Alegeți dosarul de descărcări. Subdosarul pentru video descărcate va fi "
-"creat automat în acest dosar folosind structura de mai jos."
+msgid "_Add..."
+msgstr "_Adaugă..."
 
 #: rapid/glade3/prefs.ui.h:39
-msgid "Day start:"
-msgstr "Ziua de început:"
+msgid "R_emove All"
+msgstr "Șt_erge tot"
 
 #: rapid/glade3/prefs.ui.h:40
-msgid "Delete photos and videos from device upon download completion"
-msgstr ""
-"Șterge fotografii și video din dispozitiv dacă descărcarea este complectă"
+msgid "Job Codes"
+msgstr "Coduri Sarcină"
 
 #: rapid/glade3/prefs.ui.h:41
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr ""
+"Copy text \t\r\n"
+"<span weight=\"bold\" size=\"x-large\">Dispozitiv</span>"
+
+#: rapid/glade3/prefs.ui.h:42
 msgid "Devices"
 msgstr "Dispozitive"
 
-#: 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"
 "\n"
-"You can download photos from multiple devices simultaneously, or you can "
-"specify a location on your hard drive.\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\n"
 "\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
 msgstr ""
-"Dispozitive sunt de unde descărcăm fotografii şi video, cum ar fi aparate "
-"foto digitale, carduri de memorie de stocare sau dispozitive portabile.\n"
-"\n"
-"Puteţi descărca fotografii de la mai multe dispozitive simultan, sau puteţi "
-"specifica o locaţie de pe hard disk.\n"
-"\n"
-"<i>Dacă descărcarea direct de la aparatul de fotografiat funcţionează prost "
-"sau deloc, încercaţi să-l setați pe modul PTP. În cazul în care nu este "
-"posibil, luaţi în considerare utilizarea unui cititor de card.</i>"
-
-#: rapid/glade3/prefs.ui.h:47
-msgid "Download folder:"
-msgstr "Dosarul de descărcare:"
 
 #: rapid/glade3/prefs.ui.h:48
-msgid "Downloads today:"
-msgstr "Descărcări de azi:"
+msgid "Automatically detect Portable Storage Devices"
+msgstr "Detectare automată a Dispozitivelor de Stocare Portabile"
 
 #: rapid/glade3/prefs.ui.h:49
-msgid "Error Handling"
-msgstr "Tratarea erorilor"
+msgid "Automatically detect devices"
+msgstr "Detectare automată dispozitive"
 
 #: rapid/glade3/prefs.ui.h:50
-msgid "Exit program even if download had warnings or errors"
-msgstr ""
-
-#: rapid/glade3/prefs.ui.h:51
-msgid "Exit program when download completes"
-msgstr ""
-
-#: rapid/glade3/prefs.ui.h:52
-msgid "If you disable automatic detection, choose the exact backup location."
+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 ""
-"Dacă dezactivaţi detectarea automată, alegeţi locaţia copiei de rezervă "
-"exact."
 
 #: rapid/glade3/prefs.ui.h:53
-msgid ""
-"If you disable automatic detection, choose the exact location of the images "
-"and videos."
-msgstr ""
-"Dacă dezactivați detectarea automată, alegeți exact locația pentru "
-"fotografii și video-uri"
+msgid "Location:"
+msgstr "Locație:"
 
 #: rapid/glade3/prefs.ui.h:54
 msgid ""
-"If you enable automatic detection of Portable Storage Devices, the entire "
-"device will be scanned for images. On large devices, this could take some "
-"time."
+"If you disable automatic detection, choose the exact location of the photos "
+"and videos."
 msgstr ""
-"Dacă activaţi detectarea automată de Dispozitive Portabile de Stocare, "
-"întregul dispozitiv va fi scanat pentru imagini. În cazul dispozitivelor "
-"mari, aceasta ar putea dura ceva timp."
 
 #: rapid/glade3/prefs.ui.h:55
-msgid "Job Codes"
-msgstr "Coduri Sarcină"
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:56
-msgid "Location:"
-msgstr "Locație:"
+msgid "Remembered Paths"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:57
-msgid "Miscillaneous"
+msgid ""
+"Remembered paths are those associated with devices that you have chosen to "
+"always scan or ignore when automatic detection of Portable Storage Devices "
+"is enabled."
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:58
-msgid "Overwrite"
-msgstr "Suprascrie"
+msgid "Ignored Paths"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:59
-msgid "Photo Folders"
-msgstr "Dosar Fotografii"
-
-#: rapid/glade3/prefs.ui.h:60
-msgid "Photo Rename"
-msgstr "Redenumire Fotografie"
+msgid ""
+"Specify the ending portion of any paths you want ignored when scanning "
+"devices for photos or videos. Any path ending with the values below will not "
+"be scanned."
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:61
-msgid "Photo backup folder name:"
-msgstr "Numele dosarului copie de siguranță pentru fotografii:"
+msgid "Re_move All"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:62
-msgid "Preferences: Rapid Photo Downloader"
-msgstr "Preferințe: Rapid Foto Descărcător"
+msgid "Use _python-style regular expressions"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:63
+msgid "Device Options"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:64
-msgid "R_emove All"
-msgstr "Șt_erge tot"
+msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Copie de Rezervă</span>\t"
 
 #: rapid/glade3/prefs.ui.h:65
-msgid "Rename Options"
-msgstr "Opțiuni Redenumire"
+msgid "<b>Backup</b>"
+msgstr "Copie de rezervă"
 
 #: rapid/glade3/prefs.ui.h:66
-msgid "Skip"
-msgstr "Omite"
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:67
-msgid "Skip download"
-msgstr "Omite descărcare"
+msgid "Automatically detect backup devices"
+msgstr "Detectare automată a copiilor de siguranță a dispozitivelor"
 
 #: rapid/glade3/prefs.ui.h:68
 msgid ""
-"Sorry, video downloading functionality disabled. To download videos, please "
-"install the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for "
-"python."
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
 msgstr ""
-"Funcţionalitatea descărcarii video este dezactivată. Pentru a descărca "
-"clipuri video, instalaţi <i>hachnoir metadata</i> și <i>kaa metadata</i> "
-"pachete pentru python."
+"Puteţi avea fotografiile şi video copiate de siguranță în mai multe locaţii "
+"în care sunt descărcate, de exemplu, hard diskuri externe."
 
 #: rapid/glade3/prefs.ui.h:69
+msgid "Back up photos and videos when downloading"
+msgstr "Copiază de siguranță fotografiile șî video cănd descărci"
+
+#: rapid/glade3/prefs.ui.h:70
 msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
@@ -1498,59 +1874,99 @@ msgstr ""
 "dispozitiv pentru care faceți copie de siguranță, creați un dosar în el cu "
 "numele lui.</i>"
 
-#: rapid/glade3/prefs.ui.h:72
-msgid ""
-"Specify the time in 24 hour format at which the <i>Downloads today</i> "
-"sequence number should be reset."
-msgstr ""
-"Specificaţi ora în formatul de 24 de ore la care <i>Descărcări de astăzi</i> "
-"numărul de ordine ar fi resetate."
-
 #: rapid/glade3/prefs.ui.h:73
-msgid ""
-"Specify whether photo, video and folder names should have any characters "
-"removed that are not allowed by other operating systems."
+msgid "Photo backup location:"
 msgstr ""
-"Specificaţi dacă foto, video şi nume de dosar ar trebui să aibă caractere "
-"eliminate care nu sunt permise de alte sisteme de operare."
 
 #: rapid/glade3/prefs.ui.h:74
-msgid "Start downloading at program startup"
-msgstr "Pornire descărcare la pornirea programului"
+msgid "Photo backup folder name:"
+msgstr "Numele dosarului copie de siguranță pentru fotografii:"
 
 #: rapid/glade3/prefs.ui.h:75
-msgid "Start downloading upon device insertion"
-msgstr "Pornire descărcare la introducerea dispozitivului"
+msgid "<i>Example:</i>"
+msgstr "<i>Exemplu:</i>"
 
 #: rapid/glade3/prefs.ui.h:76
-msgid "Stored number:"
-msgstr "Număr stocare:"
+msgid "<i>/media/externaldrive/Photos</i>"
+msgstr "<i>/media/dispozitiv extern/Fotografii</i>"
 
 #: rapid/glade3/prefs.ui.h:77
-msgid "Strip incompatible characters"
-msgstr "Curăță caractere incompatibile"
+msgid "Video backup folder name:"
+msgstr "Nume dosar copie de siguranță video:"
 
 #: rapid/glade3/prefs.ui.h:78
-msgid "Synchronize RAW + JPEG sequence numbers"
-msgstr "Sincronizarea RAW + JPEG numere de secvenţă"
+msgid "Video backup location:"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:79
-msgid "Unmount (\"eject\") device upon download completion"
-msgstr "Demontează (\"scoate\") dispozitiv dacă descărcarea este complectă"
+msgid "Back up"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:80
-msgid "Video Folders"
-msgstr "Dosare Video"
+msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:81
-msgid "Video Rename"
-msgstr "Redenumire Video"
+msgid "<b>Program Automation</b>"
+msgstr "<b>Program Automatizare</b>"
 
 #: rapid/glade3/prefs.ui.h:82
-msgid "Video backup folder name:"
-msgstr "Nume dosar copie de siguranță video:"
+msgid "Unmount (\"eject\") device upon download completion"
+msgstr "Demontează (\"scoate\") dispozitiv dacă descărcarea este complectă"
 
 #: rapid/glade3/prefs.ui.h:83
+msgid "Start downloading at program startup"
+msgstr "Pornire descărcare la pornirea programului"
+
+#: rapid/glade3/prefs.ui.h:84
+msgid "Start downloading upon device insertion"
+msgstr "Pornire descărcare la introducerea dispozitivului"
+
+#: rapid/glade3/prefs.ui.h:85
+msgid "Exit program when download completes"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:86
+msgid "Exit program even if download had warnings or errors"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:87
+msgid "Automatically rotate JPEG images"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:90
+msgid "Performance"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:91
+msgid "Generate thumbnails (slower)"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:92
+msgid "Miscellaneous"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:93
+msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Eroare de manipulare</span>"
+
+#: rapid/glade3/prefs.ui.h:94
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr "<b>Conflicte în Nume Fotografii și Video</b>"
+
+#: rapid/glade3/prefs.ui.h:95
+msgid "Add unique identifier"
+msgstr "Adaugă identificator unic"
+
+#: rapid/glade3/prefs.ui.h:96
+msgid "Skip download"
+msgstr "Omite descărcare"
+
+#: rapid/glade3/prefs.ui.h:97
 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."
@@ -1559,7 +1975,7 @@ msgstr ""
 "alegeţi dacă să săriţi descărcarea fişierul, sau pentru a adăuga un "
 "identificator unic."
 
-#: rapid/glade3/prefs.ui.h:84
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1567,17 +1983,17 @@ msgstr ""
 "Când copiați de siguranță, alegeți dacă să suprascrieți un fișier de pe "
 "dispozitivul de rezervă care are acelși nume, sau să-l săriți."
 
-#: rapid/glade3/prefs.ui.h:85
-msgid ""
-"You can have your photos and videos backed up to multiple locations as they "
-"are downloaded, e.g. external hard drives."
-msgstr ""
-"Puteţi avea fotografiile şi video copiate de siguranță în mai multe locaţii "
-"în care sunt descărcate, de exemplu, hard diskuri externe."
+#: rapid/glade3/prefs.ui.h:99
+msgid "Overwrite"
+msgstr "Suprascrie"
 
-#: rapid/glade3/prefs.ui.h:86
-msgid "_Add..."
-msgstr "_Adaugă..."
+#: rapid/glade3/prefs.ui.h:100
+msgid "Skip"
+msgstr "Omite"
+
+#: rapid/glade3/prefs.ui.h:101
+msgid "Error Handling"
+msgstr "Tratarea erorilor"
 
 #: rapid/glade3/about.ui.h:1
 msgid "Import your photos and videos efficiently and reliably"
@@ -1586,12 +2002,6 @@ msgstr "Importați fotografii și video eficien și fiabil"
 #~ msgid "Resetting to midnight.\n"
 #~ msgstr "Resetarea la miezul nopţii\n"
 
-#~ msgid "Download cannot proceed"
-#~ msgstr "Descărcarea nu poate continua"
-
-#~ msgid "The following download path could not be created:\n"
-#~ msgstr "Următoarea cale de descărcare nu a putut fi creată:\n"
-
 #~ msgid "There is an error in the program preferences."
 #~ msgstr "Este o eroare în preferințe program."
 
@@ -1599,93 +2009,25 @@ msgstr "Importați fotografii și video eficien și fiabil"
 #~ msgstr "erori"
 
 #, python-format
-#~ msgid "Source: %s\n"
-#~ msgstr "Sursă: %s\n"
-
-#~ msgid "Error:"
-#~ msgstr "Eroare:"
-
-#, python-format
-#~ msgid "Destination: %s"
-#~ msgstr "Destinație: %s"
-
-#, python-format
-#~ msgid "Device: %s\n"
-#~ msgstr "Dispozitiv: %s\n"
-
-#~ msgid "Photo has already been downloaded"
-#~ msgstr "Fotografia este deja descărcată"
-
-#, python-format
-#~ msgid "Attempting to download %s files"
-#~ msgstr "Aștept să descarc %s fișiere"
-
-#, python-format
 #~ msgid "Download has started from %s"
 #~ msgstr "Descărcarea a început de la %s"
 
-#~ msgid "No suitable backup volume was found"
-#~ msgstr "N-am găsit nici un volum de rezervă adecvat"
-
-#~ msgid "Could not delete photo or video from device"
-#~ msgstr "Nu pot șterge fotografii sau video din dispozitiv"
-
 #, python-format
 #~ msgid "Download complete from %s"
 #~ msgstr "Descărcare complectă din %s"
 
-#~ msgid "_Show this message again"
-#~ msgstr "_Arată acest mesaj din nou"
-
-#~ msgid "Downloading directly from a camera may work poorly or not at all"
-#~ msgstr "Descărcarea direct din aparat s-ar putea să lucreze slab sau deloc"
-
-#~ msgid ""
-#~ "Downloading from a card reader always works and is generally much faster. It "
-#~ "is strongly recommended to use a card reader."
-#~ msgstr ""
-#~ "Descărcarea de la un cititor de card funcţionează întotdeauna şi este, în "
-#~ "general, mult mai rapid. Este recomandat să utilizaţi un cititor de card."
-
 #~ msgid "This device or partition will always be used to download from"
 #~ msgstr ""
 #~ "Acest dispozitiv sau partiţie va fi întotdeauna folosit pentru a descărca de "
 #~ "la"
 
-#~ msgid "Status"
-#~ msgstr "Status"
-
 #~ msgid "This device or partition will never be used to download from"
 #~ msgstr ""
 #~ "Acest dispozitiv sau partiţie nu va fi folosit pentru a descărca de la"
 
-#~ msgid "Path"
-#~ msgstr "Cale"
-
-#~ msgid "Date"
-#~ msgstr "Dată"
-
-#~ msgid "File"
-#~ msgstr "Fișier"
-
-#~ msgid "Type"
-#~ msgstr "Tip"
-
-#~ msgid "Problem with Download Folders"
-#~ msgstr "Probleme cu Dosarele de Descărcare"
-
-#~ msgid "Displaying warning about downloading directly from camera"
-#~ msgstr "Afişarea avertisment despre descărcarea direct de la aparat"
-
 #~ msgid "Some preferences will be reset."
 #~ msgstr "Câteva preferințe vor fi resetate."
 
-#~ msgid "Problem with Download Folder"
-#~ msgstr "Probleme cu Dosarul de Descărcare"
-
-#~ msgid "Problem with Device Location Folder"
-#~ msgstr "Problemă cu Locația Dosarului Dispozitivului"
-
 #~ msgid ""
 #~ "A newer version of this program was previously run on this computer.\n"
 #~ "\n"
@@ -1715,39 +2057,15 @@ msgstr "Importați fotografii și video eficien și fiabil"
 #~ msgid "Automatically start download is true"
 #~ msgstr "Pornirea descărcării în mod automat este adevărată"
 
-#~ msgid "and"
-#~ msgstr "și"
-
-#~ msgid "MB/s"
-#~ msgstr "MB/s"
-
-#~ msgid "D_ownload Selected"
-#~ msgstr "D_escărcări Selectate"
-
-#~ msgid "All downloads complete"
-#~ msgstr "Toate descărcările complecte"
-
 #~ msgid "_Pause"
 #~ msgstr "_Pauză"
 
-#~ msgid "_Resume"
-#~ msgstr "_Reluare"
-
 #~ msgid "Goodbye"
 #~ msgstr "La revedere"
 
-#~ msgid "Download folder preferences were changed."
-#~ msgstr "Descarcă preferințele dosarului după modificare."
-
-#~ msgid "_Download All"
-#~ msgstr "_Descarcă Tot"
-
 #~ msgid "Using"
 #~ msgstr "utilizând"
 
-#~ msgid "\n"
-#~ msgstr "\n"
-
 #, python-format
 #~ msgid "%s is already running"
 #~ msgstr "%s este deja în execuţie"
@@ -1766,262 +2084,46 @@ msgstr "Importați fotografii și video eficien și fiabil"
 #~ msgid "Automation"
 #~ msgstr "Automatizare"
 
-#~ msgid "Exit program if download completes without any warnings or errors"
+#~ msgid "Backup location:"
+#~ msgstr "Locație copie de rezervă"
+
+#~ msgid "If you disable automatic detection, choose the exact backup location."
 #~ msgstr ""
-#~ "Ieși din program dacă descărcarea este complectă fără atenționări și erori"
+#~ "Dacă dezactivaţi detectarea automată, alegeţi locaţia copiei de rezervă "
+#~ "exact."
 
 #~ msgid "Error Log"
 #~ msgstr "Jurnal Erori"
 
-#~ msgid "Select All Vi_deos"
-#~ msgstr "Selectați toate Vi_deo"
-
-#~ msgid "Select All Pho_tos"
-#~ msgstr "Selectați toate Fo_tografiile"
-
-#~ msgid "Select _All"
-#~ msgstr "Selectează _tot"
-
-#~ msgid "_Device"
-#~ msgstr "_Dispozitiv"
-
-#~ msgid "_Path"
-#~ msgstr "_Cale"
-
-#~ msgid "_Preview"
-#~ msgstr "_Previzualizare"
-
-#~ msgid "_Report a Problem..."
-#~ msgstr "_Raportați o problemă..."
-
-#~ msgid "_Size"
-#~ msgstr "_Mărime"
-
-#~ msgid "Could not create temporary download directory"
-#~ msgstr "Nu am putut crea directorul temporar de descărcare"
-
-#, python-format
-#~ msgid "The path %s could not be created"
-#~ msgstr "Calea %s nu poate fi creată"
-
-#, python-format
-#~ msgid "Source: %(source)s"
-#~ msgstr "Sursă: %(source)s"
-
-#, python-format
-#~ msgid "Destination directory could not be created: %(directory)s\n"
-#~ msgstr "Directorul de destinație nu poate fi creat: %(directory)s\n"
-
-#, python-format
-#~ msgid "Error: %(inst)s"
-#~ msgstr "Erori: %(inst)s"
-
-#~ msgid "A backup location was not found"
-#~ msgstr "Locația copiei de rezervă nu a fost găsită"
-
-#, python-format
-#~ msgid "%(filetype)s is ready to be downloaded"
-#~ msgstr "%(filetype)s sunt deja descărcate"
-
-#, python-format
-#~ msgid "%(filetype)s will be downloaded with warnings"
-#~ msgstr "%(filetype)s vor fi descărcate cu avertizări"
-
-#, python-format
-#~ msgid "%(filetype)s is about to be downloaded"
-#~ msgstr "%(filetype)s vor fi descărcate"
-
-#, python-format
-#~ msgid "%(filetype)s was not downloaded"
-#~ msgstr "%(filetype)s nu au fost descărcate"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded successfully"
-#~ msgstr "%(filetype)s a fost descărcate cu succes"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded with warnings"
-#~ msgstr "%(filetype)s au fost descărcate cu avertizări"
-
-#, python-format
-#~ msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
-#~ msgstr "Dosarul %(file_type)s de Descărcări există dar nu poate fi scris.\n"
-
-#, python-format
-#~ msgid "The %(file_type)s Download Folder does not exist.\n"
-#~ msgstr "Dosarul %(file_type)s de Descărcări nu există.\n"
-
-#, python-format
-#~ msgid "Creating photo download folder %(folder)s"
-#~ msgstr "Crearea Dosarului de descărcare fotografii %(folder)s"
-
-#, python-format
-#~ msgid "Creating video download folder %(folder)s"
-#~ msgstr "Crearea dosarului de descărcări video %(folder)s"
-
-#, python-format
-#~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
-#~ msgstr "Aproximativ %(minutes)i:%(seconds)-2i minute rămân"
-
-#~ msgid "About 1 minute remaining"
-#~ msgstr "Aprozimativ 1 minut rămâne"
+#~ msgid ""
+#~ "If you enable automatic detection of Portable Storage Devices, the entire "
+#~ "device will be scanned for images. On large devices, this could take some "
+#~ "time."
+#~ msgstr ""
+#~ "Dacă activaţi detectarea automată de Dispozitive Portabile de Stocare, "
+#~ "întregul dispozitiv va fi scanat pentru imagini. În cazul dispozitivelor "
+#~ "mari, aceasta ar putea dura ceva timp."
 
 #, python-format
 #~ msgid "Device %(device)s (%(path)s) ignored"
 #~ msgstr "Dispozitiv %(device)s (%(path)s) ignorat"
 
 #, python-format
-#~ msgid "%(filetype)s downloaded"
-#~ msgstr "%(filetype)s descărcate"
-
-#, python-format
 #~ msgid "Detected %(device)s with path %(path)s"
 #~ msgstr "Detectat %(device)s cu calea %(path)s"
 
 #, python-format
-#~ msgid "About %i seconds remaining"
-#~ msgstr "Aproximativ %i secunde rămân"
-
-#, python-format
 #~ msgid "Preference value '%(value)s' is invalid"
 #~ msgstr "Valoare preferință %(value)s' este invalidă"
 
-#~ msgid "Se_lect None"
-#~ msgstr "Se_lectat Nimic"
-
-#~ msgid "Preview _Folders"
-#~ msgstr "Previzualizare _Dosare"
-
-#, python-format
-#~ msgid "%(path)s: "
-#~ msgstr "%(path)s: "
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s"
-#~ msgstr ""
-#~ "Sursă: %(source)s\n"
-#~ "Destinație: %(destination)s"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "%(problem)s"
-#~ msgstr ""
-#~ "Sursă: %(source)s\n"
-#~ "Detinație: %(destination)s\n"
-#~ "%(problem)s"
-
 #, python-format
 #~ msgid "%s selected for downloading from"
 #~ msgstr "%s selectate pentru descărcare de la"
 
 #, python-format
-#~ msgid "Photo: %(source)s"
-#~ msgstr "Fotografie: %(source)s"
-
-#, python-format
-#~ msgid ""
-#~ "Photo: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Fotografie: %(source)s\n"
-#~ "Eroare: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid "Deleted %(number)i %(filetypes)s from device"
-#~ msgstr "Șterse %(number)i %(filetypes)s din dispozitiv"
-
-#, python-format
-#~ msgid "%(filetype)s cannot be downloaded"
-#~ msgstr "%(filetype)s nu pot fi descărcate"
-
-#, python-format
-#~ msgid "Failed to create default video download folder %(folder)s"
-#~ msgstr "Nu am reușit să creez dosar descărcare video %(folder)s"
-
-#, python-format
-#~ msgid "Failed to create default photo download folder %(folder)s"
-#~ msgstr "Nu am reușit să creez dosar descărcare fotografii %(folder)s"
-
-#, python-format
-#~ msgid "%(free)s available"
-#~ msgstr "%(free)s disponibile"
-
-#, python-format
-#~ msgid "%(number)s %(numberdownloaded)s"
-#~ msgstr "%(number)s %(numberdownloaded)s"
-
-#, python-format
-#~ msgid "%(filetype)s failed to download"
-#~ msgstr "%(filetype)s au eşuat la descărcare"
-
-#~ msgid "Download device settings preferences were changed."
-#~ msgstr "Setări preferințe descărcare din dispozitiv au fost schimbate."
-
-#~ msgid "P_review Columns"
-#~ msgstr "P_revizualizare Coloane"
-
-#, python-format
-#~ msgid "Device scan complete: no %(filetypes)s found on %(device)s"
-#~ msgstr "Scanare dispozitiv complectă: nu sunt %(filetypes)s în %(device)s"
-
-#, python-format
-#~ msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
-#~ msgstr ""
-#~ "Scanare dispozitiv complectă: găsite %(number)s %(filetypes)s în %(device)s"
-
-#, python-format
-#~ msgid "%(noFiles)s %(filetypes)s downloaded"
-#~ msgstr "%(noFiles)s %(filetypes)s descărcate"
-
-#~ msgid "Backup path does not exist"
-#~ msgstr "Calea copiei de siguranță nu există"
-
-#, python-format
-#~ msgid "%(noFiles)s %(filetypes)s failed to download"
-#~ msgstr "%(noFiles)s %(filetypes)s descărcare eșuată"
-
-#, python-format
-#~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
-#~ msgstr "%(number)s din %(total)s %(filetypes)s (%(remaining)s remaining)"
-
-#, python-format
-#~ msgid "This device has no %(types_searched_for)s to download from."
-#~ msgstr ""
-#~ "Acest dispozitiv nu are %(types_searched_for)s pentru a fi descărcate."
-
-#, python-format
-#~ msgid "Error: %(errno)s %(strerror)s"
-#~ msgstr "Eroare: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid "%(file_type)s could not be backed up"
-#~ msgstr "%(file_type)s nu pot fi copiate în siguranță"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded but there were problems backing up"
-#~ msgstr ""
-#~ "%(filetype)s au fost descărcate dar sunt probleme pentru copieri de siguranță"
-
-#, python-format
 #~ msgid "Prompting whether to use %s"
 #~ msgstr "Determinați dacă doriţi să utilizaţi %s"
 
-#~ msgid "No backup devices detected"
-#~ msgstr "Nu am găsit copie de siguranță a dispozitivului"
-
-#~ msgid "Using backup device"
-#~ msgstr "Folosesc copia de siguranță a dispozitivului"
-
-#~ msgid "Using backup devices"
-#~ msgstr "Folosesc copia de siguranță a dispozitivelor"
-
-#~ msgid "Backup preferences were changed."
-#~ msgstr "Preferințele copiei de siguranță au fost schimbate."
-
 #, python-format
 #~ msgid ""
 #~ "Preference key '%(key)s' is invalid.\n"
@@ -2030,9 +2132,6 @@ msgstr "Importați fotografii și video eficien și fiabil"
 #~ "Preferința cheii '%(key)s' este invalidă\n"
 #~ "Aștept una dintre %(value)s"
 
-#~ msgid "Subfolder and filename preferences were changed."
-#~ msgstr "Preferințele subdosarului și numelui fișier au fost schimbate."
-
 #~ msgid ""
 #~ "Rapid Photo Downloader is free software; you can redistribute it and/or "
 #~ "modify it under the terms of the GNU General Public License as published by "
@@ -2063,77 +2162,29 @@ msgstr "Importați fotografii și video eficien și fiabil"
 #~ "Franklin Street, Fifth Floor, Boston, MA 02110 la 1301, Statele Unite ale "
 #~ "Americii."
 
-#~ msgid "_Get Help Online..."
-#~ msgstr "_Găsiți Ajutor Online..."
-
-#~ msgid "_Filename"
-#~ msgstr "_Fișier nume"
-
-#~ msgid "_Type"
-#~ msgstr "_Tip"
-
 #~ msgid "Sorry,these preferences contain an error:\n"
 #~ msgstr "Aceste preferințe conțin o eroare:\n"
 
 #, python-format
-#~ msgid "Backup %(file_type)s overwritten"
-#~ msgstr "Copia de siguranță %(file_type)s va fi rescrisă"
-
-#~ msgid "Backing up error"
-#~ msgstr "Eroare copiere de siguranță"
-
-#, python-format
 #~ msgid "%s rejected as a download device"
 #~ msgstr "%s rejectat ca și dispozitiv de descărcare"
 
-#, python-format
-#~ msgid "%(filetype)s was neither downloaded nor backed up"
-#~ msgstr "%(filetype)s nu trebuie descărcate sau copiate de siguranță"
-
-#~ msgid "About 1 second remaining"
-#~ msgstr "Aproximativ 1 secundă rămâne"
-
 #~ msgid "Invalid Downloads Today value.\n"
 #~ msgstr "Valoare Invalidă Descărcări Astăzi.\n"
 
 #~ msgid "'Start of day' preference value is corrupted.\n"
 #~ msgstr "Valorile preferinței 'Pornirea zilei' sunt corupte.\n"
 
-#~ msgid "warnings"
-#~ msgstr "avertismente"
-
-#~ msgid "No backups can occur"
-#~ msgstr "Copii de siguranță nu pot avea loc"
-
-#, python-format
-#~ msgid "%(file_type)s not backed up to %(volume)s"
-#~ msgstr "%(file_type)s nu s-a copiat de siguranță în %(volume)s"
-
-#, python-format
-#~ msgid "Backup of %(file_type)s already exists"
-#~ msgstr "Copia de siguranță a %(file_type)s există deja"
-
-#, python-format
-#~ msgid "%(file_type)s not backed up"
-#~ msgstr "%(file_type)s nu s-a copiat de siguranță"
-
 #~ msgid "New day has started - resetting 'Downloads Today' sequence number"
 #~ msgstr ""
 #~ "Nouă zi a început - resetați numărul de secvență \"Descărcările de azi\""
 
-#, python-format
-#~ msgid "The %(file_type)s was not backed up."
-#~ msgstr "Acest %(file_type)s nu s-a creat în copia de siguranță."
-
 #~ msgid "Job Code not entered"
 #~ msgstr "Codul Sarcină nu s-a introdus"
 
 #~ msgid "Job Code entered"
 #~ msgstr "Cod Sarcină introdus"
 
-#~ msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
-#~ msgstr "Introduceți un nou Cod Sarcină, sau selectați unul existent"
-
 #~ msgid "Starting downloads that have been waiting for a Job Code"
 #~ msgstr "Ponesc descărcarea care așteaptă un Cod Sarcină"
 
@@ -2146,35 +2197,6 @@ msgstr "Importați fotografii și video eficien și fiabil"
 #~ msgid "Problem using pynotify."
 #~ msgstr "Probleme folosind notificarea py."
 
-#, python-format
-#~ msgid "Warning: backup device %(device)s is currently being downloaded from"
-#~ msgstr ""
-#~ "Atenție: copia de siguranță a dispozitivului %(device)s este în curs de "
-#~ "descărcare de pe"
-
-#~ msgid "Copyright Damon Lynch 2007-10"
-#~ msgstr "Copyright Damon Lynch 2007-10"
-
-#~ msgid "Job Code"
-#~ msgstr "Cod Sarcină"
-
-#~ msgid "Stored number value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "Valoare număr stocare nu a fost actualizat, pentru că o descărcare are loc "
-#~ "în prezent"
-
-#~ msgid ""
-#~ "Downloads today value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "Valoare descărcări de astăzi nu a fost actualizată, pentru că o descărcare "
-#~ "are loc în prezent"
-
-#, python-format
-#~ msgid ""
-#~ "The %(filetype)s subfolder preferences had some unnecessary values removed."
-#~ msgstr ""
-#~ "Preferințele subdosarului %(filetype)s au fost șterse câteva valori inutile."
-
 #~ msgid ""
 #~ "\n"
 #~ "Please check preferences, restart the program, and try again."
@@ -2189,9 +2211,6 @@ msgstr "Importați fotografii și video eficien și fiabil"
 #~ "Preferinţele programului par a fi valabil, verificaţi pentru a asigura "
 #~ "funcţionarea corectă."
 
-#~ msgid "Please check your system and try again."
-#~ msgstr "Verificați-vă sistemul și încercați din nou."
-
 #~ msgid ""
 #~ "This version of the program uses different preferences than the old version. "
 #~ "Your preferences have been updated.\n"
@@ -2203,29 +2222,12 @@ msgstr "Importați fotografii și video eficien și fiabil"
 #~ "\n"
 #~ "Verificaţi-le pentru a asigura funcţionarea corectă."
 
-#, python-format
-#~ msgid ""
-#~ "Sorry, this device location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Locația dispozitivului nu există:\n"
-#~ "%(path)s\n"
-#~ "Rezolvaţi problema, sau modificați preferinţele dvs."
-
-#~ msgid ""
-#~ "Sorry, problems were encountered with your download folders. Please fix the "
-#~ "problems or modify the preferences.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Probleme au fost întâmpinate cu dosarele de descărcare. Corectaţi problemele "
-#~ "sau să modificați preferinţele.\n"
-#~ "\n"
-
 #~ msgid "Sorry, some preferences are invalid and will be reset."
 #~ msgstr "Unele preferinţe sunt invalide şi vor fi resetate."
 
+#~ msgid "Backup"
+#~ msgstr "Copie de rezervă"
+
 #~ msgid "Resetting value to zero.\n"
 #~ msgstr "Se resetează valore la zero.\n"
 
@@ -2235,9 +2237,6 @@ msgstr "Importați fotografii și video eficien și fiabil"
 #~ msgid "The device can now be safely removed"
 #~ msgstr "Dispozitivul poate fi scos în siguranță"
 
-#~ msgid "Downloading From Cameras"
-#~ msgstr "Descărcarea din Aparat"
-
 #~ msgid ""
 #~ "This version of the program is newer than the previously run version. "
 #~ "Checking preferences."
@@ -2253,8 +2252,3 @@ msgstr "Importați fotografii și video eficien și fiabil"
 #~ "Această versiune de program folosește preferințe diferite decât versiunea "
 #~ "veche. Câteva din preferințe sunt invalide și nu pot fi actualizate. Ele vor "
 #~ "fi resetate."
-
-#~ msgid ""
-#~ "Warning: desktop environment notification server is incorrectly configured."
-#~ msgstr ""
-#~ "Avertizare: mediul desktop este configurat incorect pentru notificare server."
diff --git a/po/ru.po b/po/ru.po
index 3fb90ac..efe5954 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,23 +7,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-23 04:00-0500\n"
-"PO-Revision-Date: 2012-07-03 07:38+0000\n"
-"Last-Translator: Eugene Marshal <Unknown>\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:16+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 00:24+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 "Language: ru\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -32,33 +32,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:119
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:122
+#: rapid/rapid.py:127
 #, 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:157
+#: rapid/rapid.py:162
 msgid "Device"
 msgstr "Носитель"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:175
+#: rapid/rapid.py:180
 msgid "Size"
 msgstr "Размер"
 
-#: rapid/rapid.py:178
+#: rapid/rapid.py:183
 msgid "Download Progress"
 msgstr "Ход загрузки"
 
-#: rapid/rapid.py:336
+#: rapid/rapid.py:343
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s не отсоединён"
@@ -67,22 +67,22 @@ msgstr "%(device)s не отсоединён"
 #. looking for photos or videos. It is visible initially in the progress bar for each device
 #. (which normally holds "x photos and videos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1216
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr "поиск файлов..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1782
+#: rapid/rapid.py:1818
 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:1786
+#: rapid/rapid.py:1822
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Загрузка из %(location)s."
 
-#: rapid/rapid.py:1787
+#: rapid/rapid.py:1823
 msgid ""
 "Do you really want to download from here? On some systems, scanning this "
 "location can take a very long time."
@@ -90,15 +90,15 @@ msgstr ""
 "Вы точно хотите загрузить отсюда? На некоторых системах сканирование этого "
 "местоположения может занять много времени."
 
-#: rapid/rapid.py:2209
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr "Загрузка"
 
-#: rapid/rapid.py:2212
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr "Пауза"
 
-#: rapid/rapid.py:2317
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -109,7 +109,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2320
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -118,176 +118,187 @@ msgstr ""
 "Неправильно указанная папка загрузки:\n"
 "%s"
 
-#: rapid/rapid.py:2321
+#: rapid/rapid.py:2380
 msgid "Download cannot proceed"
 msgstr "Невозможно загрузить"
 
-#: rapid/rapid.py:2700
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "фото"
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "видео"
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr ""
+
+#: rapid/rapid.py:2802
 msgid "About 1 second remaining"
 msgstr "Осталась примерно 1 секунда"
 
-#: rapid/rapid.py:2702
+#: rapid/rapid.py:2804
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Осталось %i  секунд"
 
-#: rapid/rapid.py:2704
+#: rapid/rapid.py:2806
 msgid "About 1 minute remaining"
 msgstr "Осталась примерно 1 минута"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:2709
+#: rapid/rapid.py:2811
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Осталось примерно %(minutes)i:%(seconds)02i"
 
-#: rapid/rapid.py:2731 rapid/rpdfile.py:123
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
 msgid "photos and videos"
 msgstr "фото и видео"
 
-#: rapid/rapid.py:2733 rapid/rpdfile.py:125
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
 msgid "photos or videos"
 msgstr "фото или видео"
 
-#: rapid/rapid.py:2736 rapid/rapid.py:3558 rapid/rpdfile.py:128
-msgid "videos"
-msgstr "видео"
-
-#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
-#: rapid/rpdfile.py:291
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
 msgid "video"
 msgstr "видео"
 
-#: rapid/rapid.py:2741 rapid/rapid.py:3556 rapid/rpdfile.py:133
-msgid "photos"
-msgstr "фото"
-
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2743 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
-#: rapid/rpdfile.py:272
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
 msgid "photo"
 msgstr "фото"
 
-#: rapid/rapid.py:2770
+#: rapid/rapid.py:2872
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s загружено"
 
-#: rapid/rapid.py:2774
+#: rapid/rapid.py:2876
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s не удалось загрузить"
 
-#: rapid/rapid.py:2777 rapid/rapid.py:2829
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
 msgid "warnings"
 msgstr "предупреждения"
 
-#: rapid/rapid.py:2786
+#: rapid/rapid.py:2892
 msgid "All downloads complete"
 msgstr "Все загрузки завершены"
 
-#: rapid/rapid.py:2792 rapid/rapid.py:2801 rapid/rapid.py:2810
-#: rapid/rapid.py:2819 rapid/rapid.py:2827
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2794 rapid/rapid.py:2812
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s загружено"
 
-#: rapid/rapid.py:2803 rapid/rapid.py:2821
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s не удалось загрузить"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2860
+#: rapid/rapid.py:2970
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr "%(number)s из %(total)s %(filetypes)s (%(remaining)s осталось)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:2977
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s из %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3222
+#: rapid/rapid.py:3331
 msgid "From"
 msgstr "Из"
 
-#: rapid/rapid.py:3230
+#: rapid/rapid.py:3339
 msgid "Auto Detect"
 msgstr "Автоопределение"
 
-#: rapid/rapid.py:3234 rapid/preferencesdialog.py:1327
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Выберите каталог, содержащий %(file_types)s"
 
-#: rapid/rapid.py:3275
+#: rapid/rapid.py:3384
 msgid "Copy"
 msgstr "Копировать"
 
-#: rapid/rapid.py:3288
+#: rapid/rapid.py:3397
 msgid "Move"
 msgstr "Переместить"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3419
 msgid "To"
 msgstr "к"
 
-#: rapid/rapid.py:3317 rapid/rapid.py:3986
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
 msgid "Photos:"
 msgstr "Фото:"
 
-#: rapid/rapid.py:3320 rapid/preferencesdialog.py:1164
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
 msgid "Select a folder to download photos to"
 msgstr "Выберите каталог для загрузки фото"
 
-#: rapid/rapid.py:3332 rapid/rapid.py:3986
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
 msgid "Videos:"
 msgstr "Видео:"
 
-#: rapid/rapid.py:3334 rapid/preferencesdialog.py:1182
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
 msgid "Select a folder to download videos to"
 msgstr "Выберите каталог для загрузки видео"
 
-#: rapid/rapid.py:3526
+#: rapid/rapid.py:3650
 msgid "and"
 msgstr "и"
 
-#: rapid/rapid.py:3531
+#: rapid/rapid.py:3655
 msgid "Using backup devices"
 msgstr "Использование носителя для резервного копирования"
 
-#: rapid/rapid.py:3533
+#: rapid/rapid.py:3657
 msgid "Using backup device"
 msgstr "Использование носителя для резервного копирования"
 
-#: rapid/rapid.py:3535
+#: rapid/rapid.py:3659
 msgid "No backup devices detected"
 msgstr "Не обнаружен носитель для резервных копий"
 
-#: rapid/rapid.py:3562
+#: rapid/rapid.py:3686
 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:3574
+#: rapid/rapid.py:3698
 #, 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:3578
+#: rapid/rapid.py:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "Доступно %(free)s для %(file_type)s"
@@ -295,88 +306,88 @@ msgstr "Доступно %(free)s для %(file_type)s"
 #. Inserted in the middle of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:3583
+#: rapid/rapid.py:3707
 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:3588
+#: rapid/rapid.py:3712
 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:3594
+#: rapid/rapid.py:3718
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s свободно"
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3602
+#: rapid/rapid.py:3726
 #, python-format
 msgid "Backing up photos and videos to %(path)s"
 msgstr "Резервное копирование фотографий и видеозаписей в %(path)s"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3605
+#: rapid/rapid.py:3729
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Резервное копирование в  %(path)s"
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3608
+#: rapid/rapid.py:3732
 #, python-format
 msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr ""
 "Резервное копирование фотографий в %(path)s и видеозаписей в %(path2)s"
 
-#: rapid/rapid.py:3615
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3644
+#: rapid/rapid.py:3768
 msgid "Program preferences are invalid"
 msgstr "Настройки программы не корректны"
 
-#: rapid/rapid.py:3770 rapid/rpdfile.py:273
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
 msgid "Photo"
 msgstr "Фото"
 
-#: rapid/rapid.py:3772 rapid/rpdfile.py:292
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "Видео"
 
-#: rapid/rapid.py:3781
+#: rapid/rapid.py:3921
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "Указанный для загрузки каталог %(file_type)s не существует"
 
-#: rapid/rapid.py:3783 rapid/rapid.py:3797 rapid/rapid.py:3810
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
 msgid "Folder: %s"
 msgstr "Каталог: %s"
 
-#: rapid/rapid.py:3795
+#: rapid/rapid.py:3935
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "для %(file_type)s папка загрузки указана неверно."
 
-#: rapid/rapid.py:3808
+#: rapid/rapid.py:3948
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "каталог для %(file_type)s доступен только для чтения"
 
-#: rapid/rapid.py:3894
+#: rapid/rapid.py:4034
 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:3949
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -385,21 +396,21 @@ msgstr ""
 "выводить информацию в командной строке во время выполнения программы (по "
 "умолчанию: %default)"
 
-#: rapid/rapid.py:3950
+#: rapid/rapid.py:4090
 msgid "display debugging information when run from the command line"
 msgstr "отображать отладочную информацию при запуске из командной строки"
 
-#: rapid/rapid.py:3951
+#: rapid/rapid.py:4091
 msgid "only output errors to the command line"
 msgstr "выводить в командную строку только ошибки"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3953
+#: rapid/rapid.py:4093
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 "вывести расширения фото- и видеофайлов, которые распознает программа, и выйти"
 
-#: rapid/rapid.py:3955
+#: rapid/rapid.py:4095
 msgid ""
 "automatically detect devices from which to download, overwriting existing "
 "program preferences"
@@ -407,7 +418,7 @@ msgstr ""
 "автоматически определять устройство,  с которого будет производиться "
 "загрузка, заменяя существующие настройки программы"
 
-#: rapid/rapid.py:3956
+#: rapid/rapid.py:4096
 msgid ""
 "manually specify the PATH of the device from which to download, overwriting "
 "existing program preferences"
@@ -415,11 +426,11 @@ msgstr ""
 "самостоятельно укажите расположение (PATH) устройства, с которого будет "
 "производиться загрузка, заменяя существующие настройки программы"
 
-#: rapid/rapid.py:3957
+#: rapid/rapid.py:4097
 msgid "reset all program settings and preferences and exit"
 msgstr "сбросить все настройки и выйти"
 
-#: rapid/rapid.py:3970
+#: rapid/rapid.py:4110
 msgid ""
 "Error: specify device auto-detection or manually specify a device's path "
 "from which to download, but do not do both."
@@ -428,25 +439,26 @@ msgstr ""
 "укажите расположение устройства, с которого будет производиться загрузка, но "
 "не используйте сразу оба варианта."
 
-#: rapid/rapid.py:3991
+#: rapid/rapid.py:4133
 #, python-format
 msgid "and %s"
 msgstr "и %s"
 
-#: rapid/rapid.py:3999
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
 msgstr "Все установки и настройки были сброшены"
 
-#: rapid/backupfile.py:157 rapid/backupfile.py:180
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
 msgid "Backing up error"
 msgstr "Ошибка резервного копирования"
 
-#: rapid/backupfile.py:159
+#: rapid/backupfile.py:151
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Каталог назначения не может быть создан: %(directory)s\n"
 
-#: rapid/backupfile.py:161 rapid/backupfile.py:182 rapid/subfolderfile.py:199
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -455,13 +467,29 @@ msgstr ""
 "Источник: %(source)s\n"
 "Назначение: %(destination)s"
 
-#: rapid/backupfile.py:164 rapid/backupfile.py:184
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Ошибка: %(inst)s"
 
-#: rapid/copyfiles.py:163 rapid/subfolderfile.py:214
-#: rapid/subfolderfile.py:347 rapid/subfolderfile.py:365
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -470,6 +498,10 @@ msgstr ""
 "%(problem)s\n"
 "Файл: %(file)s"
 
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr ""
+
 #: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Обнаружен носитель"
@@ -953,21 +985,21 @@ msgstr ""
 msgid "Path:"
 msgstr "Расположение:"
 
-#: rapid/preferencesdialog.py:1082
+#: rapid/preferencesdialog.py:1092
 msgid "Job Code"
 msgstr "Метка"
 
-#: rapid/preferencesdialog.py:1353
+#: rapid/preferencesdialog.py:1363
 msgid "Select a folder in which to backup photos"
 msgstr "Выберите папку в которой будут хранить резервные копии фотографий"
 
-#: rapid/preferencesdialog.py:1366
+#: rapid/preferencesdialog.py:1376
 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:1461
+#: rapid/preferencesdialog.py:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -975,7 +1007,7 @@ msgstr ""
 "<i><b>Внимание:</b> Недостаточно метаданных для создания имен файлов. "
 "Пожалуйста, используйте другие варианты переименования.</i>"
 
-#: rapid/preferencesdialog.py:1512
+#: rapid/preferencesdialog.py:1524
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -985,13 +1017,13 @@ msgstr ""
 "подкаталогов.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/preferencesdialog.py:1515
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Пример: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1605
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -1002,7 +1034,7 @@ msgstr ""
 "использованы.\n"
 "Они сброшены до значений по умолчанию."
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1762
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -1013,7 +1045,7 @@ msgstr ""
 "исправите их:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1752
+#: rapid/preferencesdialog.py:1764
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -1023,17 +1055,17 @@ msgstr ""
 "Регулярное выражение недопустимо и будет удалено, если вы не исправите его:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1753
+#: rapid/preferencesdialog.py:1765
 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:1934
+#: rapid/preferencesdialog.py:1949
 msgid "externaldrive1"
 msgstr "внешнийдиск1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1936
+#: rapid/preferencesdialog.py:1951
 msgid "externaldrive2"
 msgstr "внешнийдиск2"
 
@@ -1110,55 +1142,60 @@ msgid "Stockholm"
 msgstr "Стокгольм"
 
 #. components
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:358
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
 msgstr "подкаталог"
 
-#: rapid/problemnotification.py:28 rapid/subfolderfile.py:356
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr "имя файла"
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr "Значение даты и времени %s установлено неверно."
 
-#: rapid/problemnotification.py:82
+#: rapid/problemnotification.py:86
 msgid "Filename does not have an extension."
 msgstr "Название файла не содержит расширения."
 
 #. a number component is something like the 8346 in IMG_8346.JPG
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:88
 msgid "Filename does not have a number component."
 msgstr "В имени файла нет порядкового номера"
 
-#: rapid/problemnotification.py:85
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr "Ошибка создания компонента %s."
 
 #. a generic problem
-#: rapid/problemnotification.py:87
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr "для %(filetype)s не удается прочитать метаданные"
 
-#: rapid/problemnotification.py:89
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "%(filetype)s %(area)s не удалось создать"
 
-#: rapid/problemnotification.py:91 rapid/problemnotification.py:92
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr "Произошла ошибка при копировании %(filetype)s"
 
-#: rapid/problemnotification.py:94 rapid/problemnotification.py:95
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr ""
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "%(filetype)s уже существует"
 
-#: rapid/problemnotification.py:98
+#: rapid/problemnotification.py:105
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1167,7 +1204,7 @@ msgstr ""
 "Резервная копия %(filetype)s не может быть создана, так как не найдено "
 "хранилище резервных копий."
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:110
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -1176,12 +1213,12 @@ msgstr ""
 "%(image1)s было создано %(image1_date)s в %(image1_time)s и %(image2)s "
 "создано %(image2_date)s в %(image2_time)s."
 
-#: rapid/problemnotification.py:104
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "%(filetype)s уже был загружен"
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:115
 #, python-format
 msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
@@ -1190,53 +1227,59 @@ msgstr ""
 "Файл %(filetype)s изменен %(date)s в %(time)s. Добавлен уникальный код "
 "'%(identifier)s'."
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:116
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr "Файл %(filetype)s был изменен %(date)s в %(time)s"
 
-#: rapid/problemnotification.py:110
+#: rapid/problemnotification.py:117
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr "Недостаточно данных для переименования файла %(filetype)s."
 
-#: rapid/problemnotification.py:112
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Ошибка: %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:202
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr "Метаданные могут быть повреждены."
 
-#: rapid/problemnotification.py:205
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
 msgstr "Файл с таким именем, расширением и метаданными уже есть."
 
-#: rapid/problemnotification.py:224
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " Сделана резервная копия на %(volume)s"
 
-#: rapid/problemnotification.py:226
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr " Сделана резервная копия на: "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:229 rapid/problemnotification.py:290
-#: rapid/problemnotification.py:302
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s и %(final_volume)s."
 
-#: rapid/problemnotification.py:241
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
@@ -1245,263 +1288,314 @@ msgstr ""
 "Обнаружены фотографии с одинаковыми названиями, но сделанные в разное время: "
 "%(details)s"
 
-#: rapid/problemnotification.py:258
+#: rapid/problemnotification.py:269
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr ""
 "Произошла ошибка при создании резервной копии на %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:260
+#: rapid/problemnotification.py:271
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr "Произошла ошибка при создании резервной копии на %(volume)s."
 
-#: rapid/problemnotification.py:262
+#: rapid/problemnotification.py:273
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr ""
 "Произошли ошибки при создании резервной копии на следующих носителях: "
 
-#: rapid/problemnotification.py:266 rapid/problemnotification.py:314
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:268
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:272 rapid/problemnotification.py:316
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr "%(volumes)s и %(volume)s (%(inst)s)."
 
-#: rapid/problemnotification.py:277
+#: rapid/problemnotification.py:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s и %(volume)s."
 
-#: rapid/problemnotification.py:285
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "Уже существует резервная копия на %(volume)s."
 
-#: rapid/problemnotification.py:287
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr "Уже существует резервная копия на: "
 
-#: rapid/problemnotification.py:297
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "Резервная копия на %(volume)s перезаписана."
 
-#: rapid/problemnotification.py:299
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr "Перезаписана резерная копия на носителе: "
 
-#: rapid/problemnotification.py:310
+#: rapid/problemnotification.py:321
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr "Произошла ошибка при создании каталогов на %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:312
+#: rapid/problemnotification.py:323
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr "Произошла ошибка при создании каталогов на следующих устройствах: "
 
-#: rapid/problemnotification.py:323
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "В дополнение к %(previousproblem)s: %(newproblem)s"
 
-#: rapid/problemnotification.py:331
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " К тому же есть %(problems)s."
 
-#: rapid/problemnotification.py:333
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " К тому же была %(problem)s."
 
-#: rapid/problemnotification.py:342
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "В метаданных пропущен %(type)s"
 
-#: rapid/problemnotification.py:344
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr "Эти метаданные пропущены: "
 
-#: rapid/problemnotification.py:347
+#: rapid/problemnotification.py:371
 #, python-format
 msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr "%(missing_metadata_elements)s, %(final_missing_metadata_element)s."
 
-#: rapid/problemnotification.py:364
+#: rapid/problemnotification.py:388
 msgid "Problems in subfolder and filename generation"
 msgstr "При задании имени каталога и файла возникли ошибки."
 
-#: rapid/problemnotification.py:366
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr "Ошибка при задании имени каталога и файла."
 
-#: rapid/problemnotification.py:369
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Возникли ошибки при создании %s"
 
-#: rapid/problemnotification.py:371
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Ошибка при создании %s"
 
-#: rapid/problemnotification.py:380
+#: rapid/problemnotification.py:404
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr "Хотя %(filetype)s уже существует, резервная копия все равно создана."
 
-#: rapid/problemnotification.py:382
+#: rapid/problemnotification.py:406
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 "При копировании %(filetype)s возникла ошибка, но резервная копия все равно "
 "создана."
 
-#: rapid/problemnotification.py:402
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr "Обнаружены многочисленные проблемы"
 
-#: rapid/problemnotification.py:404 rapid/subfolderfile.py:233
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 "Обнаружены фотографии с одинаковыми названиями, но сделанные в разное время"
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr "ошибки при создании резервной копии"
 
-#: rapid/problemnotification.py:411
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr "Ошибки при создании резервной копии"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr "была ошибка при резевном копировании"
 
-#: rapid/problemnotification.py:414
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr "Была ошибка при резевном копировании"
 
 #. e.g.
-#: rapid/problemnotification.py:417
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, еще %(backinguperror)s"
 
-#: rapid/rpdfile.py:153
+#: rapid/rpdfile.py:159
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/rpdfile.py:163
+#: rapid/rpdfile.py:169
 #, python-format
 msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 msgstr ""
 "проверка (найдено %(photos)s фотографий и %(videos)s видеозаписей)..."
 
-#: rapid/subfolderfile.py:80
+#: rapid/subfolderfile.py:81
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr "подкаталог и название файла"
+
+#: rapid/subfolderfile.py:406
 msgid "Photo has already been downloaded"
 msgstr "Фото уже загружено"
 
-#: rapid/subfolderfile.py:302
+#: rapid/subfolderfile.py:407
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Источник: %(source)s"
 
-#: rapid/subfolderfile.py:354
-msgid "subfolder and filename"
-msgstr "подкаталог и название файла"
-
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:485
 msgid "Failed to create download subfolder"
 msgstr "Не удалось создать каталог для загрузки"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:486
 #, python-format
 msgid "Path: %s"
 msgstr "Путь: %s"
 
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr ""
+
 #: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
+msgstr "_Отметить все"
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "_Сделать пожервование"
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr "_Получить помощь в интернете..."
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr "_Сообщить о проблеме..."
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr "_Снять все отметки"
+
+#: rapid/glade3/rapid.ui.h:16
 msgid "_File"
 msgstr "_Файл"
 
-#: rapid/glade3/rapid.ui.h:3
+#: rapid/glade3/rapid.ui.h:17
 msgid "Download / Pause"
 msgstr "Загрузка / Пауза"
 
-#: rapid/glade3/rapid.ui.h:4
+#: rapid/glade3/rapid.ui.h:18
 msgid "_Select"
 msgstr "_Выделить"
 
-#: rapid/glade3/rapid.ui.h:5
+#: rapid/glade3/rapid.ui.h:19
 msgid "Select All Without _Job Code"
 msgstr "Выбрать всё _без меток"
 
-#: rapid/glade3/rapid.ui.h:6
+#: rapid/glade3/rapid.ui.h:20
 msgid "Select All Wit_h Job Code"
 msgstr "Выбрать всё с _метками"
 
-#: rapid/glade3/rapid.ui.h:7
+#: rapid/glade3/rapid.ui.h:21
 msgid "_View"
 msgstr "_Просмотр"
 
-#: rapid/glade3/rapid.ui.h:8
+#: rapid/glade3/rapid.ui.h:22
 msgid "_Error Log"
 msgstr "_Журнал ошибок"
 
-#: rapid/glade3/rapid.ui.h:9
+#: rapid/glade3/rapid.ui.h:23
 msgid "_Clear Completed Downloads"
 msgstr "_Убрать завершённые загрузки"
 
-#: rapid/glade3/rapid.ui.h:10
+#: rapid/glade3/rapid.ui.h:24
 msgid "Previous File"
 msgstr "Предыдущий файл"
 
-#: rapid/glade3/rapid.ui.h:11
+#: rapid/glade3/rapid.ui.h:25
 msgid "Next File"
 msgstr "Следующий файл"
 
-#: rapid/glade3/rapid.ui.h:12
+#: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
 msgstr "_Помощь"
 
-#: rapid/glade3/rapid.ui.h:13
-msgid "_Make a Donation..."
-msgstr "_Сделать пожервование"
-
-#: rapid/glade3/rapid.ui.h:14
+#: rapid/glade3/rapid.ui.h:27
 msgid "_Translate this Application..."
 msgstr "_Перевести это приложение..."
 
-#: rapid/glade3/rapid.ui.h:15
-msgid "_Check All"
-msgstr "_Отметить все"
-
-#: rapid/glade3/rapid.ui.h:16
-msgid "_Uncheck All"
-msgstr "_Снять все отметки"
-
-#: rapid/glade3/rapid.ui.h:17
+#: rapid/glade3/rapid.ui.h:28
 msgid "_Include in download"
 msgstr "_Включить в загрузку"
 
-#: rapid/glade3/rapid.ui.h:18
+#: rapid/glade3/rapid.ui.h:29
 msgid "_Download"
 msgstr "_Загрузить"
 
@@ -1828,7 +1922,7 @@ msgstr ""
 "прямо во время загрузки, в том числе на внешних жёстких дисках."
 
 #: rapid/glade3/prefs.ui.h:69
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr ""
 "Создавать резервные копии фотографий и видеороликов во время загрузки"
 
@@ -1871,8 +1965,8 @@ msgid "Video backup location:"
 msgstr "Размещение для резервного копирования видео:"
 
 #: rapid/glade3/prefs.ui.h:79
-msgid "Backup"
-msgstr "Резервное копирование"
+msgid "Back up"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:80
 msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
@@ -1907,35 +2001,39 @@ msgstr "Завершить программу даже при ошибках з�
 msgid "Automatically rotate JPEG images"
 msgstr "Автоматически поворачивать изображения JPEG"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:90
 msgid "Performance"
 msgstr "Быстродействие"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:91
 msgid "Generate thumbnails (slower)"
 msgstr "Создавать миниатюры (дольше копируется)"
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:92
 msgid "Miscellaneous"
 msgstr "Прочие"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Обработка ошибок</span>"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Конфликт названий между фото и видео</b>"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Add unique identifier"
 msgstr "Добавить уникальную метку"
 
-#: rapid/glade3/prefs.ui.h:94
+#: rapid/glade3/prefs.ui.h:96
 msgid "Skip download"
 msgstr "Пропустить загрузку"
 
-#: rapid/glade3/prefs.ui.h:95
+#: rapid/glade3/prefs.ui.h:97
 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."
@@ -1943,7 +2041,7 @@ msgstr ""
 "Если фотография или видеоролик с таким названием уже загружен, выберите, "
 "пропустить загрузку или добавить уникальный идентификатор."
 
-#: rapid/glade3/prefs.ui.h:96
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1951,15 +2049,15 @@ msgstr ""
 "Во время резервного копирования следует перезаписать файл, имеющий тоже "
 "самое название, или пропустить его?"
 
-#: rapid/glade3/prefs.ui.h:97
+#: rapid/glade3/prefs.ui.h:99
 msgid "Overwrite"
 msgstr "Перезаписать"
 
-#: rapid/glade3/prefs.ui.h:98
+#: rapid/glade3/prefs.ui.h:100
 msgid "Skip"
 msgstr "Пропустить"
 
-#: rapid/glade3/prefs.ui.h:99
+#: rapid/glade3/prefs.ui.h:101
 msgid "Error Handling"
 msgstr "Обработка ошибок"
 
@@ -2005,15 +2103,9 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ msgid "_Pause"
 #~ msgstr "_Пауза"
 
-#~ msgid "_Report a Problem..."
-#~ msgstr "_Сообщить о проблеме..."
-
 #~ msgid "_Photos"
 #~ msgstr "_Фотографии"
 
-#~ msgid "_Get Help Online..."
-#~ msgstr "_Получить помощь в интернете..."
-
 #, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
@@ -2082,6 +2174,9 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ msgid "Automation"
 #~ msgstr "Автоматизация"
 
+#~ msgid "Backup"
+#~ msgstr "Резервное копирование"
+
 #~ msgid "Backup location:"
 #~ msgstr "Местоположение резервных копий"
 
diff --git a/po/sk.po b/po/sk.po
index 73c1284..35d6650 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1612,7 +1612,7 @@ msgid "Backup"
 msgstr "Záloha"
 
 #: rapid/glade3/prefs.ui.h:36
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:37
diff --git a/po/sr.po b/po/sr.po
index a602eb1..918de94 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,23 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-06-23 04:00-0500\n"
-"PO-Revision-Date: 2012-10-30 08:48+0000\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-21 23:47+0000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-26 19:04+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 "Language: sr\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Брзи преносилац фотографија"
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:119
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:122
+#: rapid/rapid.py:127
 #, 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:157
+#: rapid/rapid.py:162
 msgid "Device"
 msgstr "Уређај"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:175
+#: rapid/rapid.py:180
 msgid "Size"
 msgstr "Величина"
 
-#: rapid/rapid.py:178
+#: rapid/rapid.py:183
 msgid "Download Progress"
 msgstr "Напредак преузимања"
 
-#: rapid/rapid.py:336
+#: rapid/rapid.py:343
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s није демонтиран"
@@ -66,22 +66,22 @@ msgstr "%(device)s није демонтиран"
 #. looking for photos or videos. It is visible initially in the progress bar for each device
 #. (which normally holds "x photos and videos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1216
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr "претражујем уређај..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1782
+#: rapid/rapid.py:1818
 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:1786
+#: rapid/rapid.py:1822
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Преузми са %(location)s."
 
-#: rapid/rapid.py:1787
+#: rapid/rapid.py:1823
 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 ""
 "Да ли заиста желите да преузмете слике одавде? На неким системима "
 "претраживање те путање може да потраје."
 
-#: rapid/rapid.py:2209
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr "Преузми"
 
-#: rapid/rapid.py:2212
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr "Паузирај"
 
-#: rapid/rapid.py:2317
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -108,7 +108,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2320
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -117,176 +117,189 @@ msgstr ""
 "Следећа фасцикла за преузимање је неисправна:\n"
 "%s"
 
-#: rapid/rapid.py:2321
+#: rapid/rapid.py:2380
 msgid "Download cannot proceed"
 msgstr "Не могу да наставим преузимање"
 
-#: rapid/rapid.py:2700
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+"Ниједан уређај резерве не садржи исправну фасциклу за стварање резерве "
+"„%(filetype)s“"
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "фотографије"
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "видео"
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr "Проблем са резервом"
+
+#: rapid/rapid.py:2802
 msgid "About 1 second remaining"
 msgstr "Преостала је 1 секунда"
 
-#: rapid/rapid.py:2702
+#: rapid/rapid.py:2804
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Преостало је %i секунди"
 
-#: rapid/rapid.py:2704
+#: rapid/rapid.py:2806
 msgid "About 1 minute remaining"
 msgstr "Преостао је 1 минут"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:2709
+#: rapid/rapid.py:2811
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Преостало је %(minutes)i:%(seconds)02i"
 
-#: rapid/rapid.py:2731 rapid/rpdfile.py:123
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
 msgid "photos and videos"
 msgstr "фотографије и видео"
 
-#: rapid/rapid.py:2733 rapid/rpdfile.py:125
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
 msgid "photos or videos"
 msgstr "фотографије или видео"
 
-#: rapid/rapid.py:2736 rapid/rapid.py:3558 rapid/rpdfile.py:128
-msgid "videos"
-msgstr "видео"
-
-#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
-#: rapid/rpdfile.py:291
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
 msgid "video"
 msgstr "видео"
 
-#: rapid/rapid.py:2741 rapid/rapid.py:3556 rapid/rpdfile.py:133
-msgid "photos"
-msgstr "фотографије"
-
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2743 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
-#: rapid/rpdfile.py:272
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
 msgid "photo"
 msgstr "фотографија"
 
-#: rapid/rapid.py:2770
+#: rapid/rapid.py:2872
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s преузето"
 
-#: rapid/rapid.py:2774
+#: rapid/rapid.py:2876
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s није преузето"
 
-#: rapid/rapid.py:2777 rapid/rapid.py:2829
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
 msgid "warnings"
 msgstr "упозорења"
 
-#: rapid/rapid.py:2786
+#: rapid/rapid.py:2892
 msgid "All downloads complete"
 msgstr "Сва преузимања су завршена"
 
-#: rapid/rapid.py:2792 rapid/rapid.py:2801 rapid/rapid.py:2810
-#: rapid/rapid.py:2819 rapid/rapid.py:2827
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2794 rapid/rapid.py:2812
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s преузето"
 
-#: rapid/rapid.py:2803 rapid/rapid.py:2821
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s није преузето"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2860
+#: rapid/rapid.py:2970
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr "%(number)s од %(total)s %(filetypes)s (преостаје %(remaining)s)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:2977
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s од %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3222
+#: rapid/rapid.py:3331
 msgid "From"
 msgstr "Од"
 
-#: rapid/rapid.py:3230
+#: rapid/rapid.py:3339
 msgid "Auto Detect"
 msgstr "Сам одреди"
 
-#: rapid/rapid.py:3234 rapid/preferencesdialog.py:1327
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Изаберите фасциклу која садржи %(file_types)s"
 
-#: rapid/rapid.py:3275
+#: rapid/rapid.py:3384
 msgid "Copy"
 msgstr "Умножи"
 
-#: rapid/rapid.py:3288
+#: rapid/rapid.py:3397
 msgid "Move"
 msgstr "Премести"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3419
 msgid "To"
 msgstr "У"
 
-#: rapid/rapid.py:3317 rapid/rapid.py:3986
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
 msgid "Photos:"
 msgstr "Фотографије:"
 
-#: rapid/rapid.py:3320 rapid/preferencesdialog.py:1164
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
 msgid "Select a folder to download photos to"
 msgstr "Изаберите фасциклу за чување фотографија"
 
-#: rapid/rapid.py:3332 rapid/rapid.py:3986
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
 msgid "Videos:"
 msgstr "Видео:"
 
-#: rapid/rapid.py:3334 rapid/preferencesdialog.py:1182
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
 msgid "Select a folder to download videos to"
 msgstr "Изаберите фасциклу за смештање преузетог видеа"
 
-#: rapid/rapid.py:3526
+#: rapid/rapid.py:3650
 msgid "and"
 msgstr "и"
 
-#: rapid/rapid.py:3531
+#: rapid/rapid.py:3655
 msgid "Using backup devices"
 msgstr "Употреба резервних уређаја"
 
-#: rapid/rapid.py:3533
+#: rapid/rapid.py:3657
 msgid "Using backup device"
 msgstr "Употреба резервног уређаја"
 
-#: rapid/rapid.py:3535
+#: rapid/rapid.py:3659
 msgid "No backup devices detected"
 msgstr "Нису изабрани резервни уређаји"
 
-#: rapid/rapid.py:3562
+#: rapid/rapid.py:3686
 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:3574
+#: rapid/rapid.py:3698
 #, 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:3578
+#: rapid/rapid.py:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -294,87 +307,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:3583
+#: rapid/rapid.py:3707
 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:3588
+#: rapid/rapid.py:3712
 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:3594
+#: rapid/rapid.py:3718
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s слободно"
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3602
+#: rapid/rapid.py:3726
 #, python-format
 msgid "Backing up photos and videos to %(path)s"
 msgstr "Направи резерву слика и видеа у %(path)s"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3605
+#: rapid/rapid.py:3729
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Правим резерву у %(path)s"
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3608
+#: rapid/rapid.py:3732
 #, python-format
 msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr "Правим резерву слика у %(path)s и видеа у %(path2)s"
 
-#: rapid/rapid.py:3615
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. у %(backuppaths)s."
 
-#: rapid/rapid.py:3644
+#: rapid/rapid.py:3768
 msgid "Program preferences are invalid"
 msgstr "Подешавања програма су неисправна"
 
-#: rapid/rapid.py:3770 rapid/rpdfile.py:273
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
 msgid "Photo"
 msgstr "Фотографија"
 
-#: rapid/rapid.py:3772 rapid/rpdfile.py:292
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "Видео"
 
-#: rapid/rapid.py:3781
+#: rapid/rapid.py:3921
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "Фасцикла за преузимање %(file_type)s датотека не постоји"
 
-#: rapid/rapid.py:3783 rapid/rapid.py:3797 rapid/rapid.py:3810
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
 msgid "Folder: %s"
 msgstr "Фасцикла: %s"
 
-#: rapid/rapid.py:3795
+#: rapid/rapid.py:3935
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "Фасцикла за преузимање %(file_type)s датотека је неисправна"
 
-#: rapid/rapid.py:3808
+#: rapid/rapid.py:3948
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "Фасцикла за преузимање %(file_type)s датотека је неуписива"
 
-#: rapid/rapid.py:3894
+#: rapid/rapid.py:4034
 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:3949
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -383,22 +396,22 @@ msgstr ""
 "исписује податке о програму у командној линији док је покренут програм "
 "(подразумевано: %default)"
 
-#: rapid/rapid.py:3950
+#: rapid/rapid.py:4090
 msgid "display debugging information when run from the command line"
 msgstr ""
 "приказује податке за тражење грешака у програму при покретању из командне "
 "линије"
 
-#: rapid/rapid.py:3951
+#: rapid/rapid.py:4091
 msgid "only output errors to the command line"
 msgstr "исписује грешке само у командној линији"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3953
+#: rapid/rapid.py:4093
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr "исписује проширења подржаних слика и видеа и напушта програм"
 
-#: rapid/rapid.py:3955
+#: rapid/rapid.py:4095
 msgid ""
 "automatically detect devices from which to download, overwriting existing "
 "program preferences"
@@ -406,7 +419,7 @@ msgstr ""
 "сам открива уређаје са којих ће да преузима, преписујући постојеће поставке "
 "програма"
 
-#: rapid/rapid.py:3956
+#: rapid/rapid.py:4096
 msgid ""
 "manually specify the PATH of the device from which to download, overwriting "
 "existing program preferences"
@@ -414,11 +427,11 @@ msgstr ""
 "ручно наводи ПУТАЊУ уређаја са којих ће да преузима, преписујући постојеће "
 "поставке програма"
 
-#: rapid/rapid.py:3957
+#: rapid/rapid.py:4097
 msgid "reset all program settings and preferences and exit"
 msgstr "враћа све поставке на подразумевано и напушта програм"
 
-#: rapid/rapid.py:3970
+#: rapid/rapid.py:4110
 msgid ""
 "Error: specify device auto-detection or manually specify a device's path "
 "from which to download, but do not do both."
@@ -426,25 +439,26 @@ msgstr ""
 "Грешка: наведите самооткривање уређаја или ручно наведите путању уређаја са "
 "којих вршити преузимање, али немојте оба истовремено."
 
-#: rapid/rapid.py:3991
+#: rapid/rapid.py:4133
 #, python-format
 msgid "and %s"
 msgstr "и %s"
 
-#: rapid/rapid.py:3999
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
 msgstr "Сва подешавања су враћена на подразумеване вредности"
 
-#: rapid/backupfile.py:157 rapid/backupfile.py:180
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
 msgid "Backing up error"
 msgstr "Грешка прављења резерве"
 
-#: rapid/backupfile.py:159
+#: rapid/backupfile.py:151
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Не могу да направим циљни директоријум: %(directory)s\n"
 
-#: rapid/backupfile.py:161 rapid/backupfile.py:182 rapid/subfolderfile.py:199
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -453,13 +467,29 @@ msgstr ""
 "Извор: %(source)s\n"
 "Циљ: %(destination)s"
 
-#: rapid/backupfile.py:164 rapid/backupfile.py:184
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Грешка: %(inst)s"
 
-#: rapid/copyfiles.py:163 rapid/subfolderfile.py:214
-#: rapid/subfolderfile.py:347 rapid/subfolderfile.py:365
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr "Резерва „%(file_type)s“ је преписана"
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr "није направљена резерва за „%(file_type)s“"
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr "Резерва за „%(file_type)s“ већ постоји"
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -468,6 +498,10 @@ msgstr ""
 "%(problem)s\n"
 "Датотека: %(file)s"
 
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr "Дошло је до непознате грешке"
+
 #: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Пронађен је нови уређај"
@@ -949,20 +983,20 @@ msgstr "Одредите путање са којих никада не жели
 msgid "Path:"
 msgstr "Путања:"
 
-#: rapid/preferencesdialog.py:1082
+#: rapid/preferencesdialog.py:1092
 msgid "Job Code"
 msgstr "Код задатка"
 
-#: rapid/preferencesdialog.py:1353
+#: rapid/preferencesdialog.py:1363
 msgid "Select a folder in which to backup photos"
 msgstr "Изаберите фасциклу за резерве фотографија"
 
-#: rapid/preferencesdialog.py:1366
+#: rapid/preferencesdialog.py:1376
 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:1461
+#: rapid/preferencesdialog.py:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -970,7 +1004,7 @@ msgstr ""
 "<i><b>Упозорење:</b> Нема довољно метаподатака за образовање пуног имена. "
 "Искористите друге опције за преименовање.</i>"
 
-#: rapid/preferencesdialog.py:1512
+#: rapid/preferencesdialog.py:1524
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -979,13 +1013,13 @@ msgstr ""
 "Искористите другу опцију за именовање фасцикли.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/preferencesdialog.py:1515
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Пример: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1605
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -996,7 +1030,7 @@ msgstr ""
 "коришћене.\n"
 "Враћам поставке на подразумеване вредности."
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1762
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -1006,7 +1040,7 @@ msgstr ""
 "Следећи изрази су неисправни и биће уклоњени уколико их не поправите:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1752
+#: rapid/preferencesdialog.py:1764
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -1016,17 +1050,17 @@ msgstr ""
 "Следећи израз је неисправан и биће уклоњен уколико га не поправите:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1753
+#: rapid/preferencesdialog.py:1765
 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:1934
+#: rapid/preferencesdialog.py:1949
 msgid "externaldrive1"
 msgstr "СпољниУређај1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1936
+#: rapid/preferencesdialog.py:1951
 msgid "externaldrive2"
 msgstr "СпољниУређај2"
 
@@ -1103,55 +1137,60 @@ msgid "Stockholm"
 msgstr "Истамбул"
 
 #. components
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:358
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
 msgstr "подфасцикла"
 
-#: rapid/problemnotification.py:28 rapid/subfolderfile.py:356
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr "назив датотеке"
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr "Вредности за датум и време %s су неисправне."
 
-#: rapid/problemnotification.py:82
+#: rapid/problemnotification.py:86
 msgid "Filename does not have an extension."
 msgstr "Назив датотеке не садржи проширење."
 
 #. a number component is something like the 8346 in IMG_8346.JPG
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:88
 msgid "Filename does not have a number component."
 msgstr "Назив датотеке нема секвенцу бројева."
 
-#: rapid/problemnotification.py:85
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr "Не могу да образујем део имена за %s."
 
 #. a generic problem
-#: rapid/problemnotification.py:87
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr "Не могу да читам %(filetype)s метаподатке"
 
-#: rapid/problemnotification.py:89
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "Не могу да образујем %(filetype)s %(area)s"
 
-#: rapid/problemnotification.py:91 rapid/problemnotification.py:92
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr "Грешка приликом умножавања %(filetype)s"
 
-#: rapid/problemnotification.py:94 rapid/problemnotification.py:95
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr "„%(filetype)s“ није исправно преузета"
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "Већ постоји %(filetype)s"
 
-#: rapid/problemnotification.py:98
+#: rapid/problemnotification.py:105
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1160,7 +1199,7 @@ msgstr ""
 "Не могу да направим резерву %(filetype)s датотека јер није нађена "
 "одговарајућа локација."
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:110
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -1169,12 +1208,12 @@ msgstr ""
 "%(image1)s је сликана %(image1_date)s у %(image1_time)s, а %(image2)s "
 "%(image2_date)s у %(image2_time)s."
 
-#: rapid/problemnotification.py:104
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "%(filetype)s је већ преузет"
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:115
 #, python-format
 msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
@@ -1183,54 +1222,61 @@ msgstr ""
 "Постојећи %(filetype)s је измењен %(date)s у %(time)s. Додата је јединствена "
 "реч „%(identifier)s“."
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:116
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr "Постојећи %(filetype)s је измењен %(date)s у %(time)s."
 
-#: rapid/problemnotification.py:110
+#: rapid/problemnotification.py:117
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr "Не постоје подаци за именовање %(filetype)s."
 
-#: rapid/problemnotification.py:112
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Грешка: %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:202
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+"Провера датотеке није успела. Преузето издање се разликује од изворног."
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr "Метаподаци су можда неисправни."
 
-#: rapid/problemnotification.py:205
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
 msgstr ""
 "Назив датотеке, проширење и Ексиф подаци указују да је датотека већ преузета."
 
-#: rapid/problemnotification.py:224
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " Резерва је смештена на %(volume)s"
 
-#: rapid/problemnotification.py:226
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr " Резерва је смештена на следеће уређаје: "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:229 rapid/problemnotification.py:290
-#: rapid/problemnotification.py:302
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s и %(final_volume)s."
 
-#: rapid/problemnotification.py:241
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
@@ -1239,260 +1285,313 @@ msgstr ""
 "Нађене су фотографије са истим називом датотека, али сликане у различито "
 "време: %(details)s"
 
-#: rapid/problemnotification.py:258
+#: rapid/problemnotification.py:269
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr "Грешка приликом прављења резерве на %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:260
+#: rapid/problemnotification.py:271
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr "Грешка приликом прављења резерве на %(volume)s."
 
-#: rapid/problemnotification.py:262
+#: rapid/problemnotification.py:273
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr "Грешка приликом прављења резерве на следећим уређајима: "
 
-#: rapid/problemnotification.py:266 rapid/problemnotification.py:314
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:268
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:272 rapid/problemnotification.py:316
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr "%(volumes)s и %(volume)s (%(inst)s)."
 
-#: rapid/problemnotification.py:277
+#: rapid/problemnotification.py:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s и %(volume)s."
 
-#: rapid/problemnotification.py:285
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "Већ постоји резерва на %(volume)s."
 
-#: rapid/problemnotification.py:287
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr "Већ постоји резерва на овим местима: "
 
-#: rapid/problemnotification.py:297
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "Резерва је преписана на %(volume)s."
 
-#: rapid/problemnotification.py:299
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr "Резерва је преписана на овим уређајима: "
 
-#: rapid/problemnotification.py:310
+#: rapid/problemnotification.py:321
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr "Грешка при образовању директоријума на %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:312
+#: rapid/problemnotification.py:323
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr "Грешка при образовању директоријума на следећим уређајима: "
 
-#: rapid/problemnotification.py:323
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+"Провера датотеке на „%(volume)s“ није успела. Издање резерве се разликује од "
+"преузетог издања."
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr "Провера датотеке није успела на овим уређајима: "
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "%(previousproblem)s Додатно, %(newproblem)s"
 
-#: rapid/problemnotification.py:331
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " Такође, дошло је и до %(problems)s."
 
-#: rapid/problemnotification.py:333
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " Такође, дошло је и до %(problem)s."
 
-#: rapid/problemnotification.py:342
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Недостају %(type)s метаподаци."
 
-#: rapid/problemnotification.py:344
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr "Недостају следећи метаподаци: "
 
-#: rapid/problemnotification.py:347
+#: rapid/problemnotification.py:371
 #, python-format
 msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr "%(missing_metadata_elements)s и %(final_missing_metadata_element)s."
 
-#: rapid/problemnotification.py:364
+#: rapid/problemnotification.py:388
 msgid "Problems in subfolder and filename generation"
 msgstr "Проблеми при образовању подфасцикли и назива датотека"
 
-#: rapid/problemnotification.py:366
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr "Проблем при образовању подфасцикли и назива датотека"
 
-#: rapid/problemnotification.py:369
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Проблеми при образовању %s"
 
-#: rapid/problemnotification.py:371
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Проблем при образовању %s"
 
-#: rapid/problemnotification.py:380
+#: rapid/problemnotification.py:404
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr "Већ постоји %(filetype)s, али је направљена резерва"
 
-#: rapid/problemnotification.py:382
+#: rapid/problemnotification.py:406
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 "Дошло је до грешке приликом умножавања %(filetype)s, али је направљена "
 "резерва"
 
-#: rapid/problemnotification.py:402
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr "Дошло је до више грешака"
 
-#: rapid/problemnotification.py:404 rapid/subfolderfile.py:233
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 "Нађене су фотографије са истим именом, које су сликане у различито време"
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr "дошло је до грешака при прављењу резерве"
 
-#: rapid/problemnotification.py:411
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr "Дошло је до грешака при прављењу резерве"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr "дошло је до грешке при прављењу резерве"
 
-#: rapid/problemnotification.py:414
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr "Дошло је до грешке при прављењу резерве"
 
 #. e.g.
-#: rapid/problemnotification.py:417
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, и %(backinguperror)s"
 
-#: rapid/rpdfile.py:153
+#: rapid/rpdfile.py:159
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/rpdfile.py:163
+#: rapid/rpdfile.py:169
 #, python-format
 msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 msgstr "прегледам (нађох %(photos)s фотографија и %(videos)s видеа)..."
 
-#: rapid/subfolderfile.py:80
+#: rapid/subfolderfile.py:81
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr "подфасцикла и назив датотеке"
+
+#: rapid/subfolderfile.py:406
 msgid "Photo has already been downloaded"
 msgstr "Фотографије су већ преузете"
 
-#: rapid/subfolderfile.py:302
+#: rapid/subfolderfile.py:407
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Извор: %(source)s"
 
-#: rapid/subfolderfile.py:354
-msgid "subfolder and filename"
-msgstr "подфасцикла и назив датотеке"
-
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:485
 msgid "Failed to create download subfolder"
 msgstr "Не могу да направим подфасциклу за преузимање"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:486
 #, python-format
 msgid "Path: %s"
 msgstr "Путања: %s"
 
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr "О програму..."
+
 #: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
+msgstr "Изабери _све"
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr "Изабери све фотографије"
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr "Изабери све снимке"
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "_Приложите неки динар..."
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr "Помоћ на _мрежи"
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr "Помоћ"
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
+msgstr "Поставке"
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
+msgstr "Изађи"
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
+msgstr "Освежи"
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr "_Пријављивање грешака"
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
+msgstr "Преведите овај програм..."
+
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr "_Поништи сав избор"
+
+#: rapid/glade3/rapid.ui.h:16
 msgid "_File"
 msgstr "_Датотека"
 
-#: rapid/glade3/rapid.ui.h:3
+#: rapid/glade3/rapid.ui.h:17
 msgid "Download / Pause"
 msgstr "Преузми / Паузирај"
 
-#: rapid/glade3/rapid.ui.h:4
+#: rapid/glade3/rapid.ui.h:18
 msgid "_Select"
 msgstr "_Изабери"
 
-#: rapid/glade3/rapid.ui.h:5
+#: rapid/glade3/rapid.ui.h:19
 msgid "Select All Without _Job Code"
 msgstr "Изабери све без к_ода задатка"
 
-#: rapid/glade3/rapid.ui.h:6
+#: rapid/glade3/rapid.ui.h:20
 msgid "Select All Wit_h Job Code"
 msgstr "Изабери све са _кодом задатка"
 
-#: rapid/glade3/rapid.ui.h:7
+#: rapid/glade3/rapid.ui.h:21
 msgid "_View"
 msgstr "П_реглед"
 
-#: rapid/glade3/rapid.ui.h:8
+#: rapid/glade3/rapid.ui.h:22
 msgid "_Error Log"
 msgstr "Списак са _грешкама"
 
-#: rapid/glade3/rapid.ui.h:9
+#: rapid/glade3/rapid.ui.h:23
 msgid "_Clear Completed Downloads"
 msgstr "_Очисти завршена преузимања"
 
-#: rapid/glade3/rapid.ui.h:10
+#: rapid/glade3/rapid.ui.h:24
 msgid "Previous File"
 msgstr "Претходна датотека"
 
-#: rapid/glade3/rapid.ui.h:11
+#: rapid/glade3/rapid.ui.h:25
 msgid "Next File"
 msgstr "Следећа датотека"
 
-#: rapid/glade3/rapid.ui.h:12
+#: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
 msgstr "_Помоћ"
 
-#: rapid/glade3/rapid.ui.h:13
-msgid "_Make a Donation..."
-msgstr "_Приложите неки динар..."
-
-#: rapid/glade3/rapid.ui.h:14
+#: rapid/glade3/rapid.ui.h:27
 msgid "_Translate this Application..."
 msgstr "_Преведите овај програм..."
 
-#: rapid/glade3/rapid.ui.h:15
-msgid "_Check All"
-msgstr "Изабери _све"
-
-#: rapid/glade3/rapid.ui.h:16
-msgid "_Uncheck All"
-msgstr "_Поништи сав избор"
-
-#: rapid/glade3/rapid.ui.h:17
+#: rapid/glade3/rapid.ui.h:28
 msgid "_Include in download"
 msgstr "_Укључи у преузето"
 
-#: rapid/glade3/rapid.ui.h:18
+#: rapid/glade3/rapid.ui.h:29
 msgid "_Download"
 msgstr "_Преузми"
 
@@ -1809,7 +1908,7 @@ msgstr ""
 "нпр. на спољним дисковима."
 
 #: rapid/glade3/prefs.ui.h:69
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr "Направи резерву слика и видеа при преузимању"
 
 #: rapid/glade3/prefs.ui.h:70
@@ -1851,8 +1950,8 @@ msgid "Video backup location:"
 msgstr "Путања до резервног видеа:"
 
 #: rapid/glade3/prefs.ui.h:79
-msgid "Backup"
-msgstr "Резерва"
+msgid "Back up"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:80
 msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
@@ -1886,35 +1985,39 @@ msgstr "Изађи из програма чак и када постоје гр�
 msgid "Automatically rotate JPEG images"
 msgstr "Сам окрени слике"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr "Проверава датотеке након преузимања"
+
+#: rapid/glade3/prefs.ui.h:90
 msgid "Performance"
 msgstr "Учинак"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:91
 msgid "Generate thumbnails (slower)"
 msgstr "Изгради умањене приказе (спорије)"
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:92
 msgid "Miscellaneous"
 msgstr "Остало"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Превазилажење грешака</span>"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Сукоби назива видеа и слика</b>"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Add unique identifier"
 msgstr "Додај јединствену реч"
 
-#: rapid/glade3/prefs.ui.h:94
+#: rapid/glade3/prefs.ui.h:96
 msgid "Skip download"
 msgstr "Прескочи преузимање"
 
-#: rapid/glade3/prefs.ui.h:95
+#: rapid/glade3/prefs.ui.h:97
 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."
@@ -1922,7 +2025,7 @@ msgstr ""
 "Када је већ преузета фотографија или видео са истим називом, изаберите или "
 "да је прескочите или да јој додате јединствену ознаку."
 
-#: rapid/glade3/prefs.ui.h:96
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1930,15 +2033,15 @@ msgstr ""
 "Да ли да препишем датотеку са истим називом на резервном уређају или да је "
 "прескочим приликом прављења резерве."
 
-#: rapid/glade3/prefs.ui.h:97
+#: rapid/glade3/prefs.ui.h:99
 msgid "Overwrite"
 msgstr "Препиши"
 
-#: rapid/glade3/prefs.ui.h:98
+#: rapid/glade3/prefs.ui.h:100
 msgid "Skip"
 msgstr "Прескочи"
 
-#: rapid/glade3/prefs.ui.h:99
+#: rapid/glade3/prefs.ui.h:101
 msgid "Error Handling"
 msgstr "Руковање грешкама"
 
@@ -2377,9 +2480,6 @@ msgstr "Увезите ваше фотографије и видео брзо и
 #~ "Можете направити резервне копије фотографија на више места приликом "
 #~ "преузимања, нпр. на спољним дисковима."
 
-#~ msgid "_Get Help Online..."
-#~ msgstr "Помоћ на _мрежи"
-
 #~ msgid ""
 #~ "Specify the folder in which backups are stored on the device.  \n"
 #~ "\n"
@@ -2533,9 +2633,6 @@ msgstr "Увезите ваше фотографије и видео брзо и
 #~ msgid "_Photos"
 #~ msgstr "_Фотографија"
 
-#~ msgid "_Report a Problem..."
-#~ msgstr "_Пријављивање грешака"
-
 #~ msgid "Download Folder"
 #~ msgstr "Фасциклe"
 
@@ -2580,3 +2677,6 @@ msgstr "Увезите ваше фотографије и видео брзо и
 
 #~ msgid "<b>Image Rename</b>"
 #~ msgstr "<b>Преименовање фотографија</b>"
+
+#~ msgid "Backup"
+#~ msgstr "Резерва"
diff --git a/po/sv.po b/po/sv.po
index 76b2493..3426039 100644
--- a/po/sv.po
+++ b/po/sv.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-06-23 04:00-0500\n"
-"PO-Revision-Date: 2013-05-27 23:14+0000\n"
-"Last-Translator: Joachim Johansson <Unknown>\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:16+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-26 05:21+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:119
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:122
+#: rapid/rapid.py:127
 #, 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:157
+#: rapid/rapid.py:162
 msgid "Device"
 msgstr "Enhet"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:175
+#: rapid/rapid.py:180
 msgid "Size"
 msgstr "Storlek"
 
-#: rapid/rapid.py:178
+#: rapid/rapid.py:183
 msgid "Download Progress"
 msgstr "Överföringsförlopp"
 
-#: rapid/rapid.py:336
+#: rapid/rapid.py:343
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s enheter avmonterades inte"
@@ -66,22 +66,22 @@ msgstr "%(device)s enheter avmonterades inte"
 #. 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:1216
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr "söker av..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1782
+#: rapid/rapid.py:1818
 msgid "the root of the file system"
 msgstr "filsystemets rotmapp"
 
 #. message in dialog box which asks the user if they really want to be downloading from this location
-#: rapid/rapid.py:1786
+#: rapid/rapid.py:1822
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "För över från %(location)s."
 
-#: rapid/rapid.py:1787
+#: rapid/rapid.py:1823
 msgid ""
 "Do you really want to download from here? On some systems, scanning this "
 "location can take a very long time."
@@ -89,26 +89,26 @@ msgstr ""
 "Vill du verkligen föra över härifrån? På vissa filsystem kan det ta väldigt "
 "lång tid att söka av den här platsen."
 
-#: rapid/rapid.py:2209
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr "Starta överföringen"
 
-#: rapid/rapid.py:2212
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr "Pausa"
 
-#: rapid/rapid.py:2317
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
 "%(folder1)s\n"
 "%(folder2)s"
 msgstr ""
-"Följande mappar är ogiltiga:\n"
+"Följande nedladdningsmappar är ogiltiga:\n"
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2320
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -117,176 +117,187 @@ msgstr ""
 "Denna nedladdningsmapp är ogiltig:\n"
 "%s"
 
-#: rapid/rapid.py:2321
+#: rapid/rapid.py:2380
 msgid "Download cannot proceed"
 msgstr "Kan inte fortsätta överföringen"
 
-#: rapid/rapid.py:2700
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "bilder"
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "filmer"
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr ""
+
+#: rapid/rapid.py:2802
 msgid "About 1 second remaining"
 msgstr "Ungefär en sekund återstår"
 
-#: rapid/rapid.py:2702
+#: rapid/rapid.py:2804
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Ungefär %i sekunder återstår"
 
-#: rapid/rapid.py:2704
+#: rapid/rapid.py:2806
 msgid "About 1 minute remaining"
 msgstr "Ungefär en minut återstår"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:2709
+#: rapid/rapid.py:2811
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Ungefär %(minutes)i:%(seconds)02i minuter återstår"
 
-#: rapid/rapid.py:2731 rapid/rpdfile.py:123
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
 msgid "photos and videos"
 msgstr "bilder och filmer"
 
-#: rapid/rapid.py:2733 rapid/rpdfile.py:125
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
 msgid "photos or videos"
 msgstr "bilder eller filmer"
 
-#: rapid/rapid.py:2736 rapid/rapid.py:3558 rapid/rpdfile.py:128
-msgid "videos"
-msgstr "filmer"
-
-#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
-#: rapid/rpdfile.py:291
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
 msgid "video"
 msgstr "film"
 
-#: 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:2743 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
-#: rapid/rpdfile.py:272
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
 msgid "photo"
 msgstr "bild"
 
-#: rapid/rapid.py:2770
+#: rapid/rapid.py:2872
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s överfördes"
 
-#: rapid/rapid.py:2774
+#: rapid/rapid.py:2876
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s gick inte att hämta"
 
-#: rapid/rapid.py:2777 rapid/rapid.py:2829
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
 msgid "warnings"
 msgstr "varningar"
 
-#: rapid/rapid.py:2786
+#: rapid/rapid.py:2892
 msgid "All downloads complete"
 msgstr "Alla överföringar är färdiga"
 
-#: rapid/rapid.py:2792 rapid/rapid.py:2801 rapid/rapid.py:2810
-#: rapid/rapid.py:2819 rapid/rapid.py:2827
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2794 rapid/rapid.py:2812
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s överfördes"
 
-#: rapid/rapid.py:2803 rapid/rapid.py:2821
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s gick inte att föra över"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2860
+#: rapid/rapid.py:2970
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr "%(number)s av %(total)s %(filetypes)s (%(remaining)s återstår)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:2977
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s av %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3222
+#: rapid/rapid.py:3331
 msgid "From"
 msgstr "Från"
 
-#: rapid/rapid.py:3230
+#: rapid/rapid.py:3339
 msgid "Auto Detect"
 msgstr "Upptäck automatiskt"
 
-#: rapid/rapid.py:3234 rapid/preferencesdialog.py:1327
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Välj en mapp innehållande %(file_types)s"
 
-#: rapid/rapid.py:3275
+#: rapid/rapid.py:3384
 msgid "Copy"
 msgstr "Kopiera"
 
-#: rapid/rapid.py:3288
+#: rapid/rapid.py:3397
 msgid "Move"
 msgstr "Flytta"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3419
 msgid "To"
 msgstr "Till"
 
-#: rapid/rapid.py:3317 rapid/rapid.py:3986
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
 msgid "Photos:"
 msgstr "Bilder:"
 
-#: rapid/rapid.py:3320 rapid/preferencesdialog.py:1164
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
 msgid "Select a folder to download photos to"
 msgstr "Välj en mapp att överföra bilder till"
 
-#: rapid/rapid.py:3332 rapid/rapid.py:3986
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
 msgid "Videos:"
 msgstr "Filmer:"
 
-#: rapid/rapid.py:3334 rapid/preferencesdialog.py:1182
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
 msgid "Select a folder to download videos to"
 msgstr "Välj en katalog att överföra filmer till"
 
-#: rapid/rapid.py:3526
+#: rapid/rapid.py:3650
 msgid "and"
 msgstr "och"
 
-#: rapid/rapid.py:3531
+#: rapid/rapid.py:3655
 msgid "Using backup devices"
 msgstr "Använder enheter för säkerhetskopiering"
 
-#: rapid/rapid.py:3533
+#: rapid/rapid.py:3657
 msgid "Using backup device"
 msgstr "Använder enhet för säkerhetskopiering"
 
-#: rapid/rapid.py:3535
+#: rapid/rapid.py:3659
 msgid "No backup devices detected"
 msgstr "Hittade inga enheter för säkerhetskopiering"
 
-#: rapid/rapid.py:3562
+#: rapid/rapid.py:3686
 msgid "Free space:"
 msgstr "Ledigt utrymme:"
 
 #. (videos) or (photos) will be appended to the free space message displayed to the
 #. user in the status bar.
 #. you should only translate this if your language does not use parantheses
-#: rapid/rapid.py:3574
+#: rapid/rapid.py:3698
 #, 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:3578
+#: rapid/rapid.py:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -294,87 +305,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:3583
+#: rapid/rapid.py:3707
 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:3588
+#: rapid/rapid.py:3712
 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:3594
+#: rapid/rapid.py:3718
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s tillgängligt"
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3602
+#: rapid/rapid.py:3726
 #, python-format
 msgid "Backing up photos and videos to %(path)s"
 msgstr "Säkerhetskopierar bilder och filmer till %(path)s"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3605
+#: rapid/rapid.py:3729
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Säkerhetskopierar till %(path)s"
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3608
+#: rapid/rapid.py:3732
 #, python-format
 msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr "Säkerhetskopierar bilder till %(path)s och filmer till %(path2)s"
 
-#: rapid/rapid.py:3615
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3644
+#: rapid/rapid.py:3768
 msgid "Program preferences are invalid"
 msgstr "Programinställningarna är ogiltiga"
 
-#: rapid/rapid.py:3770 rapid/rpdfile.py:273
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
 msgid "Photo"
 msgstr "Bild"
 
-#: rapid/rapid.py:3772 rapid/rpdfile.py:292
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "Film"
 
-#: rapid/rapid.py:3781
+#: rapid/rapid.py:3921
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s nedladdningsmapp saknas"
 
-#: rapid/rapid.py:3783 rapid/rapid.py:3797 rapid/rapid.py:3810
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
 msgid "Folder: %s"
 msgstr "Mapp: %s"
 
-#: rapid/rapid.py:3795
+#: rapid/rapid.py:3935
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s nedladdningsmapp är ogiltig"
 
-#: rapid/rapid.py:3808
+#: rapid/rapid.py:3948
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s nedladdningsmapp är inte skrivbar"
 
-#: rapid/rapid.py:3894
+#: rapid/rapid.py:4034
 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:3949
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -383,20 +394,20 @@ msgstr ""
 "visa programinformation i kommandoraden när programmet körs (default: "
 "%default)"
 
-#: rapid/rapid.py:3950
+#: rapid/rapid.py:4090
 msgid "display debugging information when run from the command line"
 msgstr "visa debug-information när programmet körs från kommandoraden"
 
-#: rapid/rapid.py:3951
+#: rapid/rapid.py:4091
 msgid "only output errors to the command line"
 msgstr "visa fel endast på kommandoraden"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3953
+#: rapid/rapid.py:4093
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr "visa de filändelser som programmet stödjer och avsluta"
 
-#: rapid/rapid.py:3955
+#: rapid/rapid.py:4095
 msgid ""
 "automatically detect devices from which to download, overwriting existing "
 "program preferences"
@@ -404,7 +415,7 @@ msgstr ""
 "upptäck automatiskt enheter att hämta objekt från och ersätt de nuvarande "
 "programinställningarna"
 
-#: rapid/rapid.py:3956
+#: rapid/rapid.py:4096
 msgid ""
 "manually specify the PATH of the device from which to download, overwriting "
 "existing program preferences"
@@ -412,11 +423,11 @@ msgstr ""
 "ange SÖKVÄGEN manuellt till den enhet från vilken du önskar hämta objekt och "
 "ersätt de nuvarande programinställningarna"
 
-#: rapid/rapid.py:3957
+#: rapid/rapid.py:4097
 msgid "reset all program settings and preferences and exit"
 msgstr "nollställ alla inställningar och avsluta"
 
-#: rapid/rapid.py:3970
+#: rapid/rapid.py:4110
 msgid ""
 "Error: specify device auto-detection or manually specify a device's path "
 "from which to download, but do not do both."
@@ -424,25 +435,26 @@ msgstr ""
 "Fel: Aktivera antingen automatisk upptäckt av enheter eller ange en sökvägen "
 "manuellt. Du kan inte välja båda."
 
-#: rapid/rapid.py:3991
+#: rapid/rapid.py:4133
 #, python-format
 msgid "and %s"
 msgstr "och %s"
 
-#: rapid/rapid.py:3999
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
 msgstr "Alla inställningar har nollställts"
 
-#: rapid/backupfile.py:157 rapid/backupfile.py:180
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
 msgid "Backing up error"
 msgstr "Fel vid säkerhetskopiering"
 
-#: rapid/backupfile.py:159
+#: rapid/backupfile.py:151
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Målmappen kunde inte skapas: %(directory)s\n"
 
-#: rapid/backupfile.py:161 rapid/backupfile.py:182 rapid/subfolderfile.py:199
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -451,13 +463,29 @@ msgstr ""
 "Källa: %(source)s\n"
 "Destination: %(destination)s"
 
-#: rapid/backupfile.py:164 rapid/backupfile.py:184
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Fel: %(inst)s"
 
-#: rapid/copyfiles.py:163 rapid/subfolderfile.py:214
-#: rapid/subfolderfile.py:347 rapid/subfolderfile.py:365
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -466,6 +494,10 @@ msgstr ""
 "%(problem)s\n"
 "Fil: %(file)s"
 
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr ""
+
 #: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Enhet hittad"
@@ -948,20 +980,20 @@ msgstr ""
 msgid "Path:"
 msgstr "Sökväg:"
 
-#: rapid/preferencesdialog.py:1082
+#: rapid/preferencesdialog.py:1092
 msgid "Job Code"
 msgstr "Fototillfälle"
 
-#: rapid/preferencesdialog.py:1353
+#: rapid/preferencesdialog.py:1363
 msgid "Select a folder in which to backup photos"
 msgstr "Välj den mapp där du vill säkerhetskopiera bilderna"
 
-#: rapid/preferencesdialog.py:1366
+#: rapid/preferencesdialog.py:1376
 msgid "Select a folder in which to backup videos"
 msgstr "Välj den mapp där du vill säkerhetskopiera filmerna"
 
 #. 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
+#: rapid/preferencesdialog.py:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -969,7 +1001,7 @@ msgstr ""
 "<i><b>Varning:</b> Metadata saknas för att namnge filerna. Ändra "
 "namngivningsinställningarna.</i>"
 
-#: rapid/preferencesdialog.py:1512
+#: rapid/preferencesdialog.py:1524
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -978,13 +1010,13 @@ msgstr ""
 "namngivningsinställningarna.</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
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Exempel: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1605
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -995,7 +1027,7 @@ msgstr ""
 "användas.\n"
 "Återställer till standardvärden."
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1762
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -1006,7 +1038,7 @@ msgstr ""
 "ändrar dem:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1752
+#: rapid/preferencesdialog.py:1764
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -1017,17 +1049,17 @@ msgstr ""
 "ändrar det:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1753
+#: rapid/preferencesdialog.py:1765
 msgid "Invalid regular expression"
 msgstr "Ogiltigt reguljärt uttryck"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1934
+#: rapid/preferencesdialog.py:1949
 msgid "externaldrive1"
 msgstr "extern_enhet_1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1936
+#: rapid/preferencesdialog.py:1951
 msgid "externaldrive2"
 msgstr "extern_enhet_2"
 
@@ -1104,55 +1136,60 @@ msgid "Stockholm"
 msgstr "Stockholm"
 
 #. components
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:358
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
 msgstr "Undermapp"
 
-#: rapid/problemnotification.py:28 rapid/subfolderfile.py:356
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr "filnamn"
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr "Datum/tid-värdet %s verkar vara ogiltigt."
 
-#: rapid/problemnotification.py:82
+#: rapid/problemnotification.py:86
 msgid "Filename does not have an extension."
 msgstr "Filnamnet saknar filändelse."
 
 #. a number component is something like the 8346 in IMG_8346.JPG
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:88
 msgid "Filename does not have a number component."
 msgstr "Filnamnet saknar sekvensnummer."
 
-#: rapid/problemnotification.py:85
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr "Ett fel uppstod när nummer %s skulle skapas."
 
 #. a generic problem
-#: rapid/problemnotification.py:87
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr "Metadata i %(filetype)s kan inte avläsas."
 
-#: rapid/problemnotification.py:89
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "%(filetype)s %(area)s kunde inte skapas."
 
-#: rapid/problemnotification.py:91 rapid/problemnotification.py:92
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr "Ett fel uppstod när %(filetype)s skulle kopieras"
 
-#: rapid/problemnotification.py:94 rapid/problemnotification.py:95
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr ""
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "%(filetype)s finns redan"
 
-#: rapid/problemnotification.py:98
+#: rapid/problemnotification.py:105
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1161,7 +1198,7 @@ msgstr ""
 "%(filetype)s kunde inte säkerhetskopieras, eftersom ingen plats för "
 "säkerhetskopior hittades."
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:110
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -1170,12 +1207,12 @@ msgstr ""
 "%(image1)s togs den %(image1_date)s kl %(image1_time)s och %(image2)s den "
 "%(image2_date)s kl %(image2_time)s."
 
-#: rapid/problemnotification.py:104
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "%(filetype)s är redan nedladdad"
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:115
 #, python-format
 msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
@@ -1184,54 +1221,60 @@ msgstr ""
 "Den existerande %(filetype)s ändrades senast den %(date)s kl %(time)s. Den "
 "har fått '%(identifier)s' som unik identifierare."
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:116
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 "Den existerande %(filetype)s ändrades senast den %(date)s kl %(time)s."
 
-#: rapid/problemnotification.py:110
+#: rapid/problemnotification.py:117
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr "Det saknas data för att namnge %(filetype)s."
 
-#: rapid/problemnotification.py:112
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Fel: %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:202
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr "Metadatan kan vara skadad."
 
-#: rapid/problemnotification.py:205
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
 msgstr "Filnamnet, filändelsen och exif-informationen har redan överförts."
 
-#: rapid/problemnotification.py:224
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " Den har säkerhetskopierats till %(volume)s"
 
-#: rapid/problemnotification.py:226
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr " Den har säkerhetskopierats till följande enheter: "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:229 rapid/problemnotification.py:290
-#: rapid/problemnotification.py:302
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s och %(final_volume)s."
 
-#: rapid/problemnotification.py:241
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
@@ -1239,259 +1282,310 @@ msgid ""
 msgstr ""
 "Hittade bilder med samma filnamn tagna vid olika tillfällen: %(details)s"
 
-#: rapid/problemnotification.py:258
+#: rapid/problemnotification.py:269
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr "Ett fel uppstod vid säkerhetskopiering till %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:260
+#: rapid/problemnotification.py:271
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr "Ett fel uppstod vid säkerhetskopiering till %(volume)s."
 
-#: rapid/problemnotification.py:262
+#: rapid/problemnotification.py:273
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr "Ett fel uppstod vid säkerhetskopiering till följande enheter: "
 
-#: rapid/problemnotification.py:266 rapid/problemnotification.py:314
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:268
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:272 rapid/problemnotification.py:316
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr "%(volumes)s och %(volume)s (%(inst)s)."
 
-#: rapid/problemnotification.py:277
+#: rapid/problemnotification.py:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s och %(volume)s."
 
-#: rapid/problemnotification.py:285
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "En säkerhetskopia finns redan på %(volume)s."
 
-#: rapid/problemnotification.py:287
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr "En säkerhetskopia finns redan i: "
 
-#: rapid/problemnotification.py:297
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "Den befintliga säkerhetskopian skrevs över på %(volume)s."
 
-#: rapid/problemnotification.py:299
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr "Den befintliga säkerhetskopian skrevs över på: "
 
-#: rapid/problemnotification.py:310
+#: rapid/problemnotification.py:321
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr "Ett fel uppstod när mappar skulle skapas på %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:312
+#: rapid/problemnotification.py:323
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr "Ett fel uppstod när mappar skulle skapas på följande enheter: "
 
-#: rapid/problemnotification.py:323
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "%(previousproblem)s Dessutom, %(newproblem)s"
 
-#: rapid/problemnotification.py:331
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " Dessutom uppstod %(problems)s."
 
-#: rapid/problemnotification.py:333
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " Dessutom uppstod %(problem)s."
 
-#: rapid/problemnotification.py:342
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "%(type)s metadata saknas."
 
-#: rapid/problemnotification.py:344
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr "Följande metadata saknas: "
 
-#: rapid/problemnotification.py:347
+#: rapid/problemnotification.py:371
 #, python-format
 msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr ""
 "%(missing_metadata_elements)s och %(final_missing_metadata_element)s."
 
-#: rapid/problemnotification.py:364
+#: rapid/problemnotification.py:388
 msgid "Problems in subfolder and filename generation"
 msgstr "Problem vid namngivning av undermappar och filnamn"
 
-#: rapid/problemnotification.py:366
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr "Problem vid namngivning av undermappar och filnamn"
 
-#: rapid/problemnotification.py:369
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Problem vid namngivning av %s"
 
-#: rapid/problemnotification.py:371
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Problem vid namngivning av %s"
 
-#: rapid/problemnotification.py:380
+#: rapid/problemnotification.py:404
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr "%(filetype)s finns redan, men säkerhetskopierades"
 
-#: rapid/problemnotification.py:382
+#: rapid/problemnotification.py:406
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 "Ett fel uppstod vid kopiering av %(filetype)s, men säkerhetskopierades"
 
-#: rapid/problemnotification.py:402
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr "Flera fel uppstod"
 
-#: rapid/problemnotification.py:404 rapid/subfolderfile.py:233
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr "Bilder med samma filnamn, tagna vid olika tillfällen, hittades"
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr "det uppstod fel vid säkerhetskopieringen"
 
-#: rapid/problemnotification.py:411
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr "Det uppstod fel vid säkerhetskopieringen"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr "det uppstod ett fel vid säkerhetskopieringen"
 
-#: rapid/problemnotification.py:414
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr "Det uppstod ett fel vid säkerhetskopieringen"
 
 #. e.g.
-#: rapid/problemnotification.py:417
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s och %(backinguperror)s"
 
-#: rapid/rpdfile.py:153
+#: rapid/rpdfile.py:159
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/rpdfile.py:163
+#: rapid/rpdfile.py:169
 #, python-format
 msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 msgstr "söker igenom (har hittat %(photos)s bilder och %(videos)s filmer)…"
 
-#: rapid/subfolderfile.py:80
+#: rapid/subfolderfile.py:81
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr "undermapp och filnamn"
+
+#: rapid/subfolderfile.py:406
 msgid "Photo has already been downloaded"
 msgstr "Bilden har redan överförts"
 
-#: rapid/subfolderfile.py:302
+#: rapid/subfolderfile.py:407
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Källa: %(source)s"
 
-#: rapid/subfolderfile.py:354
-msgid "subfolder and filename"
-msgstr "undermapp och filnamn"
-
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:485
 msgid "Failed to create download subfolder"
 msgstr "Misslyckades med att skapa nedladdningmappen"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:486
 #, python-format
 msgid "Path: %s"
 msgstr "Sökväg: %s"
 
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr "Om..."
+
 #: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
+msgstr "_Markera allt"
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr "Markera alla bilder"
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr "Markera alla filmer"
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "_Donera..."
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr "_Få hjälp online"
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr "Hjälp"
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
+msgstr "Inställningar"
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
+msgstr "Avsluta"
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
+msgstr "Läs om"
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr "_Rapportera ett fel..."
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
+msgstr "Översätt detta program..."
+
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr "_Avmarkera allt"
+
+#: rapid/glade3/rapid.ui.h:16
 msgid "_File"
 msgstr "_Arkiv"
 
-#: rapid/glade3/rapid.ui.h:3
+#: rapid/glade3/rapid.ui.h:17
 msgid "Download / Pause"
 msgstr "Överför / Pausa"
 
-#: rapid/glade3/rapid.ui.h:4
+#: rapid/glade3/rapid.ui.h:18
 msgid "_Select"
 msgstr "_Markera"
 
-#: rapid/glade3/rapid.ui.h:5
+#: rapid/glade3/rapid.ui.h:19
 msgid "Select All Without _Job Code"
 msgstr "Markera alla som sakna_r fototillfälle"
 
-#: rapid/glade3/rapid.ui.h:6
+#: rapid/glade3/rapid.ui.h:20
 msgid "Select All Wit_h Job Code"
 msgstr "Markera alla med ett fototillf_älle"
 
-#: rapid/glade3/rapid.ui.h:7
+#: rapid/glade3/rapid.ui.h:21
 msgid "_View"
 msgstr "_Visa"
 
-#: rapid/glade3/rapid.ui.h:8
+#: rapid/glade3/rapid.ui.h:22
 msgid "_Error Log"
 msgstr "_Fellogg"
 
-#: rapid/glade3/rapid.ui.h:9
+#: rapid/glade3/rapid.ui.h:23
 msgid "_Clear Completed Downloads"
 msgstr "_Töm slutförda överföringar"
 
-#: rapid/glade3/rapid.ui.h:10
+#: rapid/glade3/rapid.ui.h:24
 msgid "Previous File"
 msgstr "Föregående fil"
 
-#: rapid/glade3/rapid.ui.h:11
+#: rapid/glade3/rapid.ui.h:25
 msgid "Next File"
 msgstr "Nästa fil"
 
-#: rapid/glade3/rapid.ui.h:12
+#: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: rapid/glade3/rapid.ui.h:13
-msgid "_Make a Donation..."
-msgstr "_Donera..."
-
-#: rapid/glade3/rapid.ui.h:14
+#: rapid/glade3/rapid.ui.h:27
 msgid "_Translate this Application..."
 msgstr "_Översätt programmet..."
 
-#: rapid/glade3/rapid.ui.h:15
-msgid "_Check All"
-msgstr "_Markera allt"
-
-#: rapid/glade3/rapid.ui.h:16
-msgid "_Uncheck All"
-msgstr "_Avmarkera allt"
-
-#: rapid/glade3/rapid.ui.h:17
+#: rapid/glade3/rapid.ui.h:28
 msgid "_Include in download"
 msgstr "_Ta med i överföring"
 
-#: rapid/glade3/rapid.ui.h:18
+#: rapid/glade3/rapid.ui.h:29
 msgid "_Download"
 msgstr "_Överför"
 
@@ -1809,7 +1903,7 @@ msgstr ""
 "överförs, till exempel externa hårddiskar."
 
 #: rapid/glade3/prefs.ui.h:69
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr "Säkerhetskopiera bilder och filmer under överföringen"
 
 #: rapid/glade3/prefs.ui.h:70
@@ -1851,8 +1945,8 @@ msgid "Video backup location:"
 msgstr "Plats för säkerhetskopiering av videor:"
 
 #: rapid/glade3/prefs.ui.h:79
-msgid "Backup"
-msgstr "Säkerhetskopia"
+msgid "Back up"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:80
 msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
@@ -1886,35 +1980,39 @@ msgstr "Avsluta programmet även om fel eller varningar uppstod"
 msgid "Automatically rotate JPEG images"
 msgstr "Rotera JPEG-bilder automatiskt"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:90
 msgid "Performance"
 msgstr "Prestanda"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:91
 msgid "Generate thumbnails (slower)"
 msgstr "Skapa miniatyrbilder (långsammare)"
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:92
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Felhantering</span>"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Bild- och filmnamnkonflikter</b>"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Add unique identifier"
 msgstr "Lägg till unik identifierare"
 
-#: rapid/glade3/prefs.ui.h:94
+#: rapid/glade3/prefs.ui.h:96
 msgid "Skip download"
 msgstr "Hoppa över överföring"
 
-#: rapid/glade3/prefs.ui.h:95
+#: rapid/glade3/prefs.ui.h:97
 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."
@@ -1922,7 +2020,7 @@ msgstr ""
 "Ange om en bild eller film med ett namn som redan finns, ska hoppas över "
 "eller tilldelas ett unikt nummer."
 
-#: rapid/glade3/prefs.ui.h:96
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1930,15 +2028,15 @@ msgstr ""
 "Ange om en bild eller film med ett namn som redan finns på säkerhetskopian, "
 "ska hoppas över eller skrivas över."
 
-#: rapid/glade3/prefs.ui.h:97
+#: rapid/glade3/prefs.ui.h:99
 msgid "Overwrite"
 msgstr "Skriv över"
 
-#: rapid/glade3/prefs.ui.h:98
+#: rapid/glade3/prefs.ui.h:100
 msgid "Skip"
 msgstr "Hoppa över"
 
-#: rapid/glade3/prefs.ui.h:99
+#: rapid/glade3/prefs.ui.h:101
 msgid "Error Handling"
 msgstr "Felhantering"
 
@@ -2476,9 +2574,6 @@ msgstr "Överför dina bilder och filmer snabbt och enkelt"
 #~ "Ange om tecken i fil- eller katalognamn som inte stöds av andra "
 #~ "operativsystem ska avlägsnas."
 
-#~ msgid "_Report a Problem..."
-#~ msgstr "_Rapportera ett fel..."
-
 #~ msgid "_Photos"
 #~ msgstr "_Bilder"
 
@@ -2496,9 +2591,6 @@ msgstr "Överför dina bilder och filmer snabbt och enkelt"
 #~ "Du kan säkerhetskopiera bilder till flera platser när de överförs, t.ex. "
 #~ "externa hårddiskar."
 
-#~ msgid "_Get Help Online..."
-#~ msgstr "_Få hjälp online"
-
 #~ msgid "_Thumbnails"
 #~ msgstr "_Miniatyrbilder"
 
@@ -2584,3 +2676,6 @@ msgstr "Överför dina bilder och filmer snabbt och enkelt"
 #, python-format
 #~ msgid "Device %(device)s (%(path)s) ignored"
 #~ msgstr "Enhete %(device)s (%(path)s) ignorerades"
+
+#~ msgid "Backup"
+#~ msgstr "Säkerhetskopia"
diff --git a/po/tr.po b/po/tr.po
index db66864..3fdcaa8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1566,7 +1566,7 @@ msgid "Backup"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:36
diff --git a/po/uk.po b/po/uk.po
index 59f1c88..db67e59 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,26 +8,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-06-23 04:00-0500\n"
-"PO-Revision-Date: 2013-04-11 12:07+0000\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:14+0000\n"
 "Last-Translator: Stuartlittle1970@gmail.com <Stuartlittle1970@gmail.com>\n"
 "Language-Team: Ukrainian <uk@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: 2013-08-26 05:20+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 
 #: rapid/glade3/prefs.ui.h:42
 msgid "Devices"
 msgstr "Пристрої"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -36,33 +36,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:119
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:122
+#: rapid/rapid.py:127
 #, 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:157
+#: rapid/rapid.py:162
 msgid "Device"
 msgstr "Пристрій"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:175
+#: rapid/rapid.py:180
 msgid "Size"
 msgstr "Розмір"
 
-#: rapid/rapid.py:178
+#: rapid/rapid.py:183
 msgid "Download Progress"
 msgstr "Поступ завантаження"
 
-#: rapid/rapid.py:336
+#: rapid/rapid.py:343
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s не від’єднано"
@@ -71,22 +71,22 @@ msgstr "%(device)s не від’єднано"
 #. looking for photos or videos. It is visible initially in the progress bar for each device
 #. (which normally holds "x photos and videos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1216
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr "сканування..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1782
+#: rapid/rapid.py:1818
 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:1786
+#: rapid/rapid.py:1822
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Завантаження з %(location)s."
 
-#: rapid/rapid.py:1787
+#: rapid/rapid.py:1823
 msgid ""
 "Do you really want to download from here? On some systems, scanning this "
 "location can take a very long time."
@@ -94,15 +94,15 @@ msgstr ""
 "Ви справді бажаєте завантажити звідси? На деяких системах сканування цього "
 "місцезнаходження може зайняти багато часу."
 
-#: rapid/rapid.py:2209
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
 msgid "Download"
 msgstr "Завантажити"
 
-#: rapid/rapid.py:2212
+#: rapid/rapid.py:2270
 msgid "Pause"
 msgstr "Призупинити"
 
-#: rapid/rapid.py:2317
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -113,7 +113,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2320
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -122,176 +122,187 @@ msgstr ""
 "Ці каталоги завантаження є некоректними:\n"
 "%s"
 
-#: rapid/rapid.py:2321
+#: rapid/rapid.py:2380
 msgid "Download cannot proceed"
 msgstr "Неможливо продовжити завантаження"
 
-#: rapid/rapid.py:2700
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
+#, python-format
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
+msgstr ""
+
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "фото"
+
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "відео"
+
+#: rapid/rapid.py:2393
+msgid "Backup problem"
+msgstr ""
+
+#: rapid/rapid.py:2802
 msgid "About 1 second remaining"
 msgstr "Залишилось біля 1 секунди"
 
-#: rapid/rapid.py:2702
+#: rapid/rapid.py:2804
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Залишилось біля %i секунд"
 
-#: rapid/rapid.py:2704
+#: rapid/rapid.py:2806
 msgid "About 1 minute remaining"
 msgstr "Залишилось біля 1 хвилини"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:2709
+#: rapid/rapid.py:2811
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Залишилось біля %(minutes)i:%(seconds)02i"
 
-#: rapid/rapid.py:2731 rapid/rpdfile.py:123
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
 msgid "photos and videos"
 msgstr "фото та відео"
 
-#: rapid/rapid.py:2733 rapid/rpdfile.py:125
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
 msgid "photos or videos"
 msgstr "фото або відео"
 
-#: rapid/rapid.py:2736 rapid/rapid.py:3558 rapid/rpdfile.py:128
-msgid "videos"
-msgstr "відео"
-
-#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
-#: rapid/rpdfile.py:291
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
 msgid "video"
 msgstr "відео"
 
-#: rapid/rapid.py:2741 rapid/rapid.py:3556 rapid/rpdfile.py:133
-msgid "photos"
-msgstr "фото"
-
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2743 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
-#: rapid/rpdfile.py:272
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
 msgid "photo"
 msgstr "фото"
 
-#: rapid/rapid.py:2770
+#: rapid/rapid.py:2872
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "Завантажено %(noFiles)s %(filetypes)s"
 
-#: rapid/rapid.py:2774
+#: rapid/rapid.py:2876
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s не вдалось завантажити"
 
-#: rapid/rapid.py:2777 rapid/rapid.py:2829
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
 msgid "warnings"
 msgstr "застереження"
 
-#: rapid/rapid.py:2786
+#: rapid/rapid.py:2892
 msgid "All downloads complete"
 msgstr "Всі завантаження завершені"
 
-#: rapid/rapid.py:2792 rapid/rapid.py:2801 rapid/rapid.py:2810
-#: rapid/rapid.py:2819 rapid/rapid.py:2827
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2794 rapid/rapid.py:2812
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s завантажено"
 
-#: rapid/rapid.py:2803 rapid/rapid.py:2821
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s не вдалось завантажити"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2860
+#: rapid/rapid.py:2970
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr "%(number)s з %(total)s %(filetypes)s (%(remaining)s залишилось)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2867
+#: rapid/rapid.py:2977
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s з %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3222
+#: rapid/rapid.py:3331
 msgid "From"
 msgstr "З"
 
-#: rapid/rapid.py:3230
+#: rapid/rapid.py:3339
 msgid "Auto Detect"
 msgstr "Автоматичне визначення"
 
-#: rapid/rapid.py:3234 rapid/preferencesdialog.py:1327
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Виберіть теку, що містить %(file_types)s"
 
-#: rapid/rapid.py:3275
+#: rapid/rapid.py:3384
 msgid "Copy"
 msgstr "Копіювати"
 
-#: rapid/rapid.py:3288
+#: rapid/rapid.py:3397
 msgid "Move"
 msgstr "Переміщення"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3419
 msgid "To"
 msgstr "До"
 
-#: rapid/rapid.py:3317 rapid/rapid.py:3986
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
 msgid "Photos:"
 msgstr "Фото:"
 
-#: rapid/rapid.py:3320 rapid/preferencesdialog.py:1164
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
 msgid "Select a folder to download photos to"
 msgstr "Виберіть теку для завантаження фото"
 
-#: rapid/rapid.py:3332 rapid/rapid.py:3986
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
 msgid "Videos:"
 msgstr "Відео:"
 
-#: rapid/rapid.py:3334 rapid/preferencesdialog.py:1182
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
 msgid "Select a folder to download videos to"
 msgstr "Виберіть теку для завантаження відео"
 
-#: rapid/rapid.py:3526
+#: rapid/rapid.py:3650
 msgid "and"
 msgstr "та"
 
-#: rapid/rapid.py:3531
+#: rapid/rapid.py:3655
 msgid "Using backup devices"
 msgstr "Використання пристроїв для резервного копіювання"
 
-#: rapid/rapid.py:3533
+#: rapid/rapid.py:3657
 msgid "Using backup device"
 msgstr "Використання пристрою для резервного копіювання"
 
-#: rapid/rapid.py:3535
+#: rapid/rapid.py:3659
 msgid "No backup devices detected"
 msgstr "Пристроїв для резервного копіювання не виявлено"
 
-#: rapid/rapid.py:3562
+#: rapid/rapid.py:3686
 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:3574
+#: rapid/rapid.py:3698
 #, 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:3578
+#: rapid/rapid.py:3702
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -299,88 +310,88 @@ msgstr "%(free)s %(file_type)s"
 #. Inserted in the middle of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:3583
+#: rapid/rapid.py:3707
 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:3588
+#: rapid/rapid.py:3712
 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:3594
+#: rapid/rapid.py:3718
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s вільно"
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3602
+#: rapid/rapid.py:3726
 #, python-format
 msgid "Backing up photos and videos to %(path)s"
 msgstr "Резервне копіювання фотографій та відеозаписів до %(path)s"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3605
+#: rapid/rapid.py:3729
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Резервне копіювання до %(path)s"
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3608
+#: rapid/rapid.py:3732
 #, python-format
 msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr ""
 "Резервне копіювання фотографій до %(path)s та відеозаписів до %(path2)s"
 
-#: rapid/rapid.py:3615
+#: rapid/rapid.py:3739
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3644
+#: rapid/rapid.py:3768
 msgid "Program preferences are invalid"
 msgstr "Налаштування програми є хибними"
 
-#: rapid/rapid.py:3770 rapid/rpdfile.py:273
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
 msgid "Photo"
 msgstr "Фото"
 
-#: rapid/rapid.py:3772 rapid/rpdfile.py:292
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "Відео"
 
-#: rapid/rapid.py:3781
+#: rapid/rapid.py:3921
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s каталог завантаження не існує"
 
-#: rapid/rapid.py:3783 rapid/rapid.py:3797 rapid/rapid.py:3810
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
 msgid "Folder: %s"
 msgstr "Каталог: %s"
 
-#: rapid/rapid.py:3795
+#: rapid/rapid.py:3935
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s каталог завантаження є хибним"
 
-#: rapid/rapid.py:3808
+#: rapid/rapid.py:3948
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s каталог завантаження не доступний для запису"
 
-#: rapid/rapid.py:3894
+#: rapid/rapid.py:4034
 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:3949
+#: rapid/rapid.py:4089
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -388,22 +399,22 @@ msgid ""
 msgstr ""
 "показати дані програми в командному рядку під час запуску (типово: %default)"
 
-#: rapid/rapid.py:3950
+#: rapid/rapid.py:4090
 msgid "display debugging information when run from the command line"
 msgstr ""
 "показувати інструкцію зі зневадження під час запуску з командного рядка"
 
-#: rapid/rapid.py:3951
+#: rapid/rapid.py:4091
 msgid "only output errors to the command line"
 msgstr "виводити в командний рядок лише помилки"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3953
+#: rapid/rapid.py:4093
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 "вивести список розширень фото та відео файлів, розпізнаних програмою і вийти"
 
-#: rapid/rapid.py:3955
+#: rapid/rapid.py:4095
 msgid ""
 "automatically detect devices from which to download, overwriting existing "
 "program preferences"
@@ -411,7 +422,7 @@ msgstr ""
 "автоматично визначати пристрій, з якого буде виконуватися завантаження, "
 "замінюючи налаштування програми що існують"
 
-#: rapid/rapid.py:3956
+#: rapid/rapid.py:4096
 msgid ""
 "manually specify the PATH of the device from which to download, overwriting "
 "existing program preferences"
@@ -419,11 +430,11 @@ msgstr ""
 "самостійно вкажіть розміщення (PATH) пристрою, з якого буде виконуватися "
 "завантаження, замінюючи налаштування програми що існують"
 
-#: rapid/rapid.py:3957
+#: rapid/rapid.py:4097
 msgid "reset all program settings and preferences and exit"
 msgstr "скинути всі параметри та налаштування програми і вийти"
 
-#: rapid/rapid.py:3970
+#: rapid/rapid.py:4110
 msgid ""
 "Error: specify device auto-detection or manually specify a device's path "
 "from which to download, but do not do both."
@@ -432,25 +443,26 @@ msgstr ""
 "розміщення пристрою, з якого буде виконуватися завантаження, але не "
 "використовуйте відразу обидва варіанти."
 
-#: rapid/rapid.py:3991
+#: rapid/rapid.py:4133
 #, python-format
 msgid "and %s"
 msgstr "та %s"
 
-#: rapid/rapid.py:3999
+#: rapid/rapid.py:4141
 msgid "All settings and preferences have been reset"
 msgstr "Всі параметри та налаштування скинуті"
 
-#: rapid/backupfile.py:157 rapid/backupfile.py:180
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
 msgid "Backing up error"
 msgstr "Помилка резервного копіювання"
 
-#: rapid/backupfile.py:159
+#: rapid/backupfile.py:151
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Не вдалось створити теку адресата: %(directory)s\n"
 
-#: rapid/backupfile.py:161 rapid/backupfile.py:182 rapid/subfolderfile.py:199
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -459,13 +471,29 @@ msgstr ""
 "Джерело: %(source)s\n"
 "Адресат: %(destination)s"
 
-#: rapid/backupfile.py:164 rapid/backupfile.py:184
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Помилка: %(inst)s"
 
-#: rapid/copyfiles.py:163 rapid/subfolderfile.py:214
-#: rapid/subfolderfile.py:347 rapid/subfolderfile.py:365
+#: rapid/backupfile.py:163
+#, python-format
+msgid "Backup %(file_type)s overwritten"
+msgstr ""
+
+#: rapid/backupfile.py:166
+#, python-format
+msgid "%(file_type)s not backed up"
+msgstr ""
+
+#: rapid/backupfile.py:168
+#, python-format
+msgid "Backup of %(file_type)s already exists"
+msgstr ""
+
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -474,6 +502,10 @@ msgstr ""
 "%(problem)s\n"
 "Файл: %(file)s"
 
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
+msgstr ""
+
 #: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Виявлений пристрій"
@@ -959,20 +991,20 @@ msgstr ""
 msgid "Path:"
 msgstr "Шлях:"
 
-#: rapid/preferencesdialog.py:1082
+#: rapid/preferencesdialog.py:1092
 msgid "Job Code"
 msgstr "Мітка"
 
-#: rapid/preferencesdialog.py:1353
+#: rapid/preferencesdialog.py:1363
 msgid "Select a folder in which to backup photos"
 msgstr "Оберіть теку у якій будуть зберігатися резервні копії фотографій"
 
-#: rapid/preferencesdialog.py:1366
+#: rapid/preferencesdialog.py:1376
 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:1461
+#: rapid/preferencesdialog.py:1473
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -980,7 +1012,7 @@ msgstr ""
 "<i><b>Увага:</b> Недостатньо метаданих для повного створення назви. "
 "Використовуйте інші варіанти перейменування.</i>"
 
-#: rapid/preferencesdialog.py:1512
+#: rapid/preferencesdialog.py:1524
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -989,13 +1021,13 @@ msgstr ""
 "Використовуйте інші варіанти найменування підтек.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/preferencesdialog.py:1515
+#: rapid/preferencesdialog.py:1527
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Приклад: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1605
+#: rapid/preferencesdialog.py:1617
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -1006,7 +1038,7 @@ msgstr ""
 "використовуватимуться.\n"
 "Ці значення будуть скинуті до типових."
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1762
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -1017,7 +1049,7 @@ msgstr ""
 "виправите їх:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1752
+#: rapid/preferencesdialog.py:1764
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -1027,17 +1059,17 @@ msgstr ""
 "Регулярний вираз неприпустимий й буде вилучено, якщо ви не виправите його:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1753
+#: rapid/preferencesdialog.py:1765
 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:1934
+#: rapid/preferencesdialog.py:1949
 msgid "externaldrive1"
 msgstr "зовнішній пристрій 1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1936
+#: rapid/preferencesdialog.py:1951
 msgid "externaldrive2"
 msgstr "зовнішній пристрій 2"
 
@@ -1114,55 +1146,60 @@ msgid "Stockholm"
 msgstr "Стокгольм"
 
 #. components
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:358
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
 msgid "subfolder"
 msgstr "підтека"
 
-#: rapid/problemnotification.py:28 rapid/subfolderfile.py:356
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
 msgid "filename"
 msgstr "назва файлу"
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr "Значення дати та часу %s встановлено неправильно."
 
-#: rapid/problemnotification.py:82
+#: rapid/problemnotification.py:86
 msgid "Filename does not have an extension."
 msgstr "В імені файлу відсутнє розширення"
 
 #. a number component is something like the 8346 in IMG_8346.JPG
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:88
 msgid "Filename does not have a number component."
 msgstr "В імені файлу відсутній числовий компонент."
 
-#: rapid/problemnotification.py:85
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "Error generating component %s."
 msgstr "Помилка створення компонента %s."
 
 #. a generic problem
-#: rapid/problemnotification.py:87
+#: rapid/problemnotification.py:91
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr "%(filetype)s не можливо прочитати метадані"
 
-#: rapid/problemnotification.py:89
+#: rapid/problemnotification.py:93
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "%(filetype)s %(area)s не може бути згенерованим"
 
-#: rapid/problemnotification.py:91 rapid/problemnotification.py:92
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr "Сталася помилка при копіюванні %(filetype)s"
 
-#: rapid/problemnotification.py:94 rapid/problemnotification.py:95
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr ""
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "%(filetype)s вже існує"
 
-#: rapid/problemnotification.py:98
+#: rapid/problemnotification.py:105
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1171,7 +1208,7 @@ msgstr ""
 "%(filetype)s не може бути збережений в резервну копію, тому, що не вказано "
 "місце для збереження резервних копій."
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:110
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -1180,12 +1217,12 @@ msgstr ""
 "%(image1)s було створено %(image1_date)s у %(image1_time)s та %(image2)s "
 "створено %(image2_date)s у %(image2_time)s."
 
-#: rapid/problemnotification.py:104
+#: rapid/problemnotification.py:111
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "%(filetype)s вже було завантажено"
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:115
 #, python-format
 msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
@@ -1194,53 +1231,59 @@ msgstr ""
 "Існуючий фал %(filetype)s було модифіковано %(date)s в %(time)s. Додано "
 "унікальний ідентифікатор '%(identifier)s' ."
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:116
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr "Існуючий фал %(filetype)s було модифіковано %(date)s в %(time)s."
 
-#: rapid/problemnotification.py:110
+#: rapid/problemnotification.py:117
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr "Не існує даних з ім’ям %(filetype)s."
 
-#: rapid/problemnotification.py:112
+#: rapid/problemnotification.py:119
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Помилка: %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:202
+#: rapid/problemnotification.py:210
+msgid ""
+"File verification failed. The downloaded version is different from the "
+"original."
+msgstr ""
+
+#: rapid/problemnotification.py:213
 msgid "The metadata might be corrupt."
 msgstr "Метадані можуть бути пошкодженими."
 
-#: rapid/problemnotification.py:205
+#: rapid/problemnotification.py:216
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
 msgstr "Файл, розширення та Exif інформація вже були завантажені."
 
-#: rapid/problemnotification.py:224
+#: rapid/problemnotification.py:235
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " Було створено резервну копію на %(volume)s"
 
-#: rapid/problemnotification.py:226
+#: rapid/problemnotification.py:237
 msgid " It was backed up to these devices: "
 msgstr " Було створено резервну копію на цих пристроях: "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:229 rapid/problemnotification.py:290
-#: rapid/problemnotification.py:302
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s та %(final_volume)s."
 
-#: rapid/problemnotification.py:241
+#: rapid/problemnotification.py:252
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
@@ -1248,262 +1291,313 @@ msgid ""
 msgstr ""
 "Виявлені файли з однаковими назвами, проте створені в різний час: %(details)s"
 
-#: rapid/problemnotification.py:258
+#: rapid/problemnotification.py:269
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr ""
 "Сталася помилка при створенні резервної копії на %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:260
+#: rapid/problemnotification.py:271
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr "Сталася помилка при створенні резервної копії на %(volume)s."
 
-#: rapid/problemnotification.py:262
+#: rapid/problemnotification.py:273
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr ""
 "Сталася помилка при створенні резервної копії на наступних пристроях: "
 
-#: rapid/problemnotification.py:266 rapid/problemnotification.py:314
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:268
+#: rapid/problemnotification.py:279
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:272 rapid/problemnotification.py:316
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr "%(volumes)s та %(volume)s (%(inst)s)."
 
-#: rapid/problemnotification.py:277
+#: rapid/problemnotification.py:288
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s та %(volume)s."
 
-#: rapid/problemnotification.py:285
+#: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "Резервна копія вже існує на %(volume)s."
 
-#: rapid/problemnotification.py:287
+#: rapid/problemnotification.py:298
 msgid "Backups already exist in these locations: "
 msgstr "Резервна копія вже існує на: "
 
-#: rapid/problemnotification.py:297
+#: rapid/problemnotification.py:308
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "Резервну копію на %(volume)s перезаписано."
 
-#: rapid/problemnotification.py:299
+#: rapid/problemnotification.py:310
 msgid "Backups overwritten on these devices: "
 msgstr "Перезаписано резервну копію на пристрої: "
 
-#: rapid/problemnotification.py:310
+#: rapid/problemnotification.py:321
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr "Сталася помилка при створені каталогів на %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:312
+#: rapid/problemnotification.py:323
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr "Сталася помилка при створені каталогів на наступних пристроях: "
 
-#: rapid/problemnotification.py:323
+#: rapid/problemnotification.py:335
+#, python-format
+msgid ""
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
+
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "У доповнення до %(previousproblem)s: %(newproblem)s"
 
-#: rapid/problemnotification.py:331
+#: rapid/problemnotification.py:355
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " До того ж є %(problems)s."
 
-#: rapid/problemnotification.py:333
+#: rapid/problemnotification.py:357
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " До того ж була %(problem)s."
 
-#: rapid/problemnotification.py:342
+#: rapid/problemnotification.py:366
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "У метаданих пропущено %(type)s"
 
-#: rapid/problemnotification.py:344
+#: rapid/problemnotification.py:368
 msgid "The following metadata is missing: "
 msgstr "Ці метадані пропущено: "
 
-#: rapid/problemnotification.py:347
+#: rapid/problemnotification.py:371
 #, python-format
 msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr "%(missing_metadata_elements)s, %(final_missing_metadata_element)s."
 
-#: rapid/problemnotification.py:364
+#: rapid/problemnotification.py:388
 msgid "Problems in subfolder and filename generation"
 msgstr "При створенні ім’я каталогу та файлу сталися помилки."
 
-#: rapid/problemnotification.py:366
+#: rapid/problemnotification.py:390
 msgid "Problem in subfolder and filename generation"
 msgstr "Помилка при створенні імені каталогу та файлу."
 
-#: rapid/problemnotification.py:369
+#: rapid/problemnotification.py:393
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Сталися помилки при створенні %s"
 
-#: rapid/problemnotification.py:371
+#: rapid/problemnotification.py:395
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Помилка %s при створенні"
 
-#: rapid/problemnotification.py:380
+#: rapid/problemnotification.py:404
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr "Хоч %(filetype)s вже існує, резервна копія все одно створена."
 
-#: rapid/problemnotification.py:382
+#: rapid/problemnotification.py:406
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 "При копіюванні %(filetype)s сталася помилка, але резервна копія все одно "
 "створена."
 
-#: rapid/problemnotification.py:402
+#: rapid/problemnotification.py:428
 msgid "Multiple problems were encountered"
 msgstr "Виявлено чисельні проблеми"
 
-#: rapid/problemnotification.py:404 rapid/subfolderfile.py:233
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr "Виявлені фото з однаковою назвою, але зроблені в різний час"
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:436
 msgid "there were errors backing up"
 msgstr "Помилки при створенні резервної копії"
 
-#: rapid/problemnotification.py:411
+#: rapid/problemnotification.py:437
 msgid "There were errors backing up"
 msgstr "Помилки при створенні резервної копії"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:439
 msgid "there was an error backing up"
 msgstr "була помилка при резевному копіюванні"
 
-#: rapid/problemnotification.py:414
+#: rapid/problemnotification.py:440
 msgid "There was an error backing up"
 msgstr "Була помилка при резевному копіюванні"
 
 #. e.g.
-#: rapid/problemnotification.py:417
+#: rapid/problemnotification.py:443
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, ще %(backinguperror)s"
 
-#: rapid/rpdfile.py:153
+#: rapid/rpdfile.py:159
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/rpdfile.py:163
+#: rapid/rpdfile.py:169
 #, python-format
 msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 msgstr ""
 "перевірка (знайдено %(photos)s фотографій та %(videos)s відеозаписів)..."
 
-#: rapid/subfolderfile.py:80
+#: rapid/subfolderfile.py:81
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr "підтека та назва файлу"
+
+#: rapid/subfolderfile.py:406
 msgid "Photo has already been downloaded"
 msgstr "Фото вже були завантажені"
 
-#: rapid/subfolderfile.py:302
+#: rapid/subfolderfile.py:407
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Джерело: %(source)s"
 
-#: rapid/subfolderfile.py:354
-msgid "subfolder and filename"
-msgstr "підтека та назва файлу"
-
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:485
 msgid "Failed to create download subfolder"
 msgstr "Не вдалося створити каталог для завантаження"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:486
 #, python-format
 msgid "Path: %s"
 msgstr "Шлях: %s"
 
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr ""
+
 #: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
+msgstr "_Позначити все"
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "_Зробити пожертву..."
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr "О_тримати довідку онлайн..."
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr "Зв_іт про помилку..."
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr "_Скасувати позначку всього"
+
+#: rapid/glade3/rapid.ui.h:16
 msgid "_File"
 msgstr "_Файл"
 
-#: rapid/glade3/rapid.ui.h:3
+#: rapid/glade3/rapid.ui.h:17
 msgid "Download / Pause"
 msgstr "Завантаження / Призупинити"
 
-#: rapid/glade3/rapid.ui.h:4
+#: rapid/glade3/rapid.ui.h:18
 msgid "_Select"
 msgstr "_Вибрати"
 
-#: rapid/glade3/rapid.ui.h:5
+#: rapid/glade3/rapid.ui.h:19
 msgid "Select All Without _Job Code"
 msgstr "Вибрати всі без _міток"
 
-#: rapid/glade3/rapid.ui.h:6
+#: rapid/glade3/rapid.ui.h:20
 msgid "Select All Wit_h Job Code"
 msgstr "Вибрати всі з _мітками"
 
-#: rapid/glade3/rapid.ui.h:7
+#: rapid/glade3/rapid.ui.h:21
 msgid "_View"
 msgstr "_Перегляд"
 
-#: rapid/glade3/rapid.ui.h:8
+#: rapid/glade3/rapid.ui.h:22
 msgid "_Error Log"
 msgstr "_Журнал помилок"
 
-#: rapid/glade3/rapid.ui.h:9
+#: rapid/glade3/rapid.ui.h:23
 msgid "_Clear Completed Downloads"
 msgstr "_Очистити завершені завантаження"
 
-#: rapid/glade3/rapid.ui.h:10
+#: rapid/glade3/rapid.ui.h:24
 msgid "Previous File"
 msgstr "Попередній Файл"
 
-#: rapid/glade3/rapid.ui.h:11
+#: rapid/glade3/rapid.ui.h:25
 msgid "Next File"
 msgstr "Наступний файл"
 
-#: rapid/glade3/rapid.ui.h:12
+#: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
 msgstr "_Довідка"
 
-#: rapid/glade3/rapid.ui.h:13
-msgid "_Make a Donation..."
-msgstr "_Зробити пожертву..."
-
-#: rapid/glade3/rapid.ui.h:14
+#: rapid/glade3/rapid.ui.h:27
 msgid "_Translate this Application..."
 msgstr "_Перекласти цю програму..."
 
-#: rapid/glade3/rapid.ui.h:15
-msgid "_Check All"
-msgstr "_Позначити все"
-
-#: rapid/glade3/rapid.ui.h:16
-msgid "_Uncheck All"
-msgstr "_Скасувати позначку всього"
-
-#: rapid/glade3/rapid.ui.h:17
+#: rapid/glade3/rapid.ui.h:28
 msgid "_Include in download"
 msgstr "Включити у завантаження"
 
-#: rapid/glade3/rapid.ui.h:18
+#: rapid/glade3/rapid.ui.h:29
 msgid "_Download"
 msgstr "_Завантажити"
 
@@ -1821,7 +1915,7 @@ msgstr ""
 "час завантаження, наприклад, на зовнішніх жорстких дисках."
 
 #: rapid/glade3/prefs.ui.h:69
-msgid "Backup photos and videos when downloading"
+msgid "Back up photos and videos when downloading"
 msgstr "Резервне копіювання фото та відео під час завантаження"
 
 #: rapid/glade3/prefs.ui.h:70
@@ -1864,8 +1958,8 @@ msgid "Video backup location:"
 msgstr "Розміщення для резервного копіювання відео:"
 
 #: rapid/glade3/prefs.ui.h:79
-msgid "Backup"
-msgstr "Резервне копіювання"
+msgid "Back up"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:80
 msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
@@ -1899,35 +1993,39 @@ msgstr "Закінчити програму навіть при помилках
 msgid "Automatically rotate JPEG images"
 msgstr "Автоматично повертати зображення JPEG"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:90
 msgid "Performance"
 msgstr "Швидкодія"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:91
 msgid "Generate thumbnails (slower)"
 msgstr "Створювати мініатюри (довше копіюється)"
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:92
 msgid "Miscellaneous"
 msgstr "Інше"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Обробка помилок</span>"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Конфлікти назв фото та відео</b>"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Add unique identifier"
 msgstr "Додати унікальний ідентифікатор"
 
-#: rapid/glade3/prefs.ui.h:94
+#: rapid/glade3/prefs.ui.h:96
 msgid "Skip download"
 msgstr "Пропустити завантаження"
 
-#: rapid/glade3/prefs.ui.h:95
+#: rapid/glade3/prefs.ui.h:97
 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."
@@ -1935,7 +2033,7 @@ msgstr ""
 "Коли фото або відео з такою ж назвою вже завантажені, виберіть, чи "
 "пропустити завантаження цього файлу, чи додати унікальний ідентифікатор."
 
-#: rapid/glade3/prefs.ui.h:96
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1943,15 +2041,15 @@ msgstr ""
 "Чи слід під час резервного копіювання перезаписати файл, що має однакову "
 "назву з файлом на пристрої, чи пропустити його?"
 
-#: rapid/glade3/prefs.ui.h:97
+#: rapid/glade3/prefs.ui.h:99
 msgid "Overwrite"
 msgstr "Перезаписати"
 
-#: rapid/glade3/prefs.ui.h:98
+#: rapid/glade3/prefs.ui.h:100
 msgid "Skip"
 msgstr "Пропустити"
 
-#: rapid/glade3/prefs.ui.h:99
+#: rapid/glade3/prefs.ui.h:101
 msgid "Error Handling"
 msgstr "Обробка помилок"
 
@@ -2227,6 +2325,9 @@ msgstr "Імпортуйте фото та відео ефективно та н
 #~ msgid "Automation"
 #~ msgstr "Автоматизація"
 
+#~ msgid "Backup"
+#~ msgstr "Резервне копіювання"
+
 #~ msgid "Backup location:"
 #~ msgstr "Місце для резервного копіювання:"
 
@@ -2279,15 +2380,9 @@ msgstr "Імпортуйте фото та відео ефективно та н
 #~ msgid "Specify what to do when there are no backup devices."
 #~ msgstr "Вкажіть, що робити, якщо немає пристроїв для резервного копіювання."
 
-#~ msgid "_Get Help Online..."
-#~ msgstr "О_тримати довідку онлайн..."
-
 #~ msgid "_Photos"
 #~ msgstr "Фо_то"
 
-#~ msgid "_Report a Problem..."
-#~ msgstr "Зв_іт про помилку..."
-
 #~ msgid "_Thumbnails"
 #~ msgstr "_МІніатюри"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index efab647..c2a1cf0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,235 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-28 02:49-0600\n"
-"PO-Revision-Date: 2011-03-08 13:47+0000\n"
-"Last-Translator: 英华 <wantinghard@gmail.com>\n"
+"POT-Creation-Date: 2014-01-21 21:34+0600\n"
+"PO-Revision-Date: 2014-01-22 00:14+0000\n"
+"Last-Translator: Wylmer Wang <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@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-03-20 22:12+0000\n"
-"X-Generator: Launchpad (build 12617)\n"
+"X-Launchpad-Export-Date: 2014-01-23 13:56+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:124 rapid/rapid.py:6468 rapid/glade3/rapid.glade.h:71
+#: rapid/rapid.py:117 rapid/rapid.py:1820 rapid/glade3/rapid.ui.h:15
 msgid "Rapid Photo Downloader"
 msgstr "快速照片下载器"
 
-#: rapid/rapid.py:461
-msgid "New York"
-msgstr "纽约"
-
-#: rapid/rapid.py:462
-msgid "Manila"
-msgstr "马尼拉"
-
-#: rapid/rapid.py:462
-msgid "Prague"
-msgstr "布拉格"
-
-#: rapid/rapid.py:462
-msgid "Helsinki"
-msgstr "赫尔辛基"
-
-#: rapid/rapid.py:462
-msgid "Wellington"
-msgstr "惠灵顿"
-
-#: rapid/rapid.py:463
-msgid "Tehran"
-msgstr "德黑兰"
-
-#: rapid/rapid.py:463
-msgid "Kampala"
-msgstr "坎帕拉"
-
-#: rapid/rapid.py:463
-msgid "Paris"
-msgstr "巴黎"
-
-#: rapid/rapid.py:463
-msgid "Berlin"
-msgstr "柏林"
-
-#: rapid/rapid.py:463
-msgid "Sydney"
-msgstr "悉尼"
-
-#: rapid/rapid.py:464
-msgid "Budapest"
-msgstr "布达佩斯"
-
-#: rapid/rapid.py:464
-msgid "Rome"
-msgstr "罗马"
-
-#: rapid/rapid.py:464
-msgid "Moscow"
-msgstr "莫斯科"
-
-#: rapid/rapid.py:464
-msgid "Delhi"
-msgstr "德里"
-
-#: rapid/rapid.py:464
-msgid "Warsaw"
-msgstr "华沙"
-
-#: rapid/rapid.py:465
-msgid "Jakarta"
-msgstr "雅加达"
-
-#: rapid/rapid.py:465
-msgid "Madrid"
-msgstr "马德里"
-
-#: rapid/rapid.py:465
-msgid "Stockholm"
-msgstr "斯德哥尔摩"
-
-#: rapid/rapid.py:499
-msgid "Invalid Downloads Today value.\n"
-msgstr ""
-
-#: rapid/rapid.py:500
-msgid "Resetting value to zero.\n"
-msgstr "归零.\n"
-
-#: rapid/rapid.py:539
-msgid "'Start of day' preference value is corrupted.\n"
-msgstr "'Start of day' 偏好值已经损坏\n"
-
-#: rapid/rapid.py:540
-msgid "Resetting to midnight.\n"
-msgstr "重设至午夜.\n"
-
-#: rapid/rapid.py:566
-msgid "Error in Photo Rename preferences"
-msgstr "照片重命名设置出错"
-
-#: rapid/rapid.py:598 rapid/rapid.py:1720
-msgid "Sorry,these preferences contain an error:\n"
-msgstr "对不起, 这些自定义设置中有错误:\n"
-
-#: rapid/rapid.py:609
-msgid "Resetting to default values."
-msgstr "重设至默认值."
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:684 rapid/renamesubfolderprefs.py:198
-msgid "Job code"
-msgstr "任务代码"
-
-#: rapid/rapid.py:752
-msgid "Error in Video Rename preferences"
-msgstr "视频重命名设置出错."
-
-#: rapid/rapid.py:770
-msgid "Error in Photo Download Subfolders preferences"
-msgstr "照片下载子文件夹设置出错."
-
-#: rapid/rapid.py:787
-msgid "Error in Video Download Subfolders preferences"
-msgstr "视频下载子文件夹出错"
-
-#: rapid/rapid.py:820 rapid/rapid.py:1551
-msgid "photos and videos"
-msgstr "图片和视频"
-
-#: rapid/rapid.py:822 rapid/rapid.py:1561 rapid/rapid.py:1689
-msgid "photos"
-msgstr "相片"
-
-#: rapid/rapid.py:955
-msgid "Select a folder to download photos to"
-msgstr "选择下载相片的目录..."
-
-#: rapid/rapid.py:973
-msgid "Select a folder to download videos to"
-msgstr "选择下载视频的目录..."
-
-#: rapid/rapid.py:1055
-#, python-format
-msgid "Select a folder containing %(file_types)s"
-msgstr "选择目录保存 %(file_types)s"
-
-#: rapid/rapid.py:1077
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
-msgstr "选择目录备份 %(file_types)s"
-
-#. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:1158
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
-"name. Please use other renaming options.</i>"
-msgstr "<i><b>警告:</b> 没有足够的数据来完成命名, 请使用其它的重命名选项.</i>"
-
-#: rapid/rapid.py:1194
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate "
-"subfolders. Please use other subfolder naming options.</i>"
-msgstr "<i><b>警告:</b> 没有足够的数据来完成自文件夹命名, 请使用其它的重命名文件夹选项.</i>"
-
-#. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:1198
-#, python-format
-msgid "<i>Example: %s</i>"
-msgstr "<i>范例: %s</i>"
-
-#: rapid/rapid.py:1224
-msgid ""
-"Downloads today value not updated, as a download is currently occurring"
-msgstr ""
-
-#: rapid/rapid.py:1240
-msgid "Stored number value not updated, as a download is currently occurring"
-msgstr ""
-
-#: rapid/rapid.py:1270
-#, python-format
-msgid ""
-"The %(filetype)s subfolder preferences had some unnecessary values removed."
-msgstr ""
-
-#. Preferences list is now empty
-#: rapid/rapid.py:1275
-#, python-format
-msgid ""
-"The %(filetype)s subfolder preferences entered are invalid and cannot be "
-"used.\n"
-"They will be reset to their default values."
-msgstr ""
-
-#. check subfolder preferences for bad values
-#: rapid/rapid.py:1289 rapid/rapid.py:1563
-msgid "photo"
-msgstr "照片"
-
-#: rapid/rapid.py:1290 rapid/rapid.py:1558
-msgid "video"
-msgstr "视频"
-
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1527
-msgid "externaldrive1"
-msgstr "外部驱动器1"
-
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1529
-msgid "externaldrive2"
-msgstr "外部驱动器2"
-
-#: rapid/rapid.py:1553 rapid/rapid.py:1687
-msgid "photos or videos"
-msgstr "照片或视频"
-
-#: rapid/rapid.py:1556
-msgid "videos"
-msgstr "视频"
-
-#: rapid/rapid.py:1568
+#: rapid/rapid.py:122
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -244,1562 +31,1805 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:1570
+#: rapid/rapid.py:124
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:1573
-#, python-format
-msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
-msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
-
-#: rapid/rapid.py:1580
+#: rapid/rapid.py:127
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/rapid.py:1608 rapid/rapid.py:2280
-msgid "subfolder and filename"
-msgstr "子文件夹和文件名"
+#. Device refers to a thing like a camera, memory card in its reader,
+#. external hard drive, Portable Storage Device, etc.
+#: rapid/rapid.py:162
+msgid "Device"
+msgstr "设备"
 
-#: rapid/rapid.py:1610 rapid/rapid.py:2282
-msgid "filename"
-msgstr "文件名"
+#. Size refers to the total size of images on the device, typically in
+#. MB or GB
+#: rapid/rapid.py:180
+msgid "Size"
+msgstr "容量"
 
-#: rapid/rapid.py:1612 rapid/rapid.py:2284
-msgid "subfolder"
-msgstr "子目录"
+#: rapid/rapid.py:183
+msgid "Download Progress"
+msgstr "下载进度"
+
+#: rapid/rapid.py:343
+#, python-format
+msgid "%(device)s did not unmount"
+msgstr ""
 
 #. This refers to when a device like a hard drive is having its contents scanned,
 #. looking for photos or videos. It is visible initially in the progress bar for each device
 #. (which normally holds "x photos and videos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1703
+#: rapid/rapid.py:1241
 msgid "scanning..."
 msgstr "正在扫描..."
 
+#. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
 #: rapid/rapid.py:1818
-msgid "The following download path could not be created:\n"
-msgstr "无法创建下列下载路径：\n"
-
-#: rapid/rapid.py:1819
-#, python-format
-msgid "%(path)s: "
-msgstr "%(path)s: "
-
-#: rapid/rapid.py:1820 rapid/rapid.py:1821 rapid/rapid.py:1836
-#: rapid/rapid.py:1837 rapid/rapid.py:2097 rapid/rapid.py:2100
-msgid "Download cannot proceed"
-msgstr "下载无法进行"
-
-#: rapid/rapid.py:1834 rapid/rapid.py:5105
-msgid "There is an error in the program preferences."
-msgstr "程序首选项存在一个错误"
-
-#: rapid/rapid.py:1835
-msgid ""
-"\n"
-"Please check preferences, restart the program, and try again."
+msgid "the root of the file system"
 msgstr ""
-"\n"
-"请检查首选项设置，然后重启程序，再试一试。"
 
-#. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
-#. It refers to the actual number of photos that can be copied. For example, the user might see the following:
-#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
-#. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:2008
+#. message in dialog box which asks the user if they really want to be downloading from this location
+#: rapid/rapid.py:1822
 #, python-format
-msgid "%(number)s %(filetypes)s"
+msgid "Downloading from %(location)s."
 msgstr ""
 
-#. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
-#. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
-#. to the user when they run the program, signifying the number of photos found, and the device they were found on.
-#. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
-#. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
-#. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:2019
-#, python-format
-msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
+#: rapid/rapid.py:1823
+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:2026
-#, python-format
-msgid "Device scan complete: no %(filetypes)s found on %(device)s"
+#: rapid/rapid.py:2267 rapid/glade3/rapid.ui.h:6
+msgid "Download"
 msgstr ""
 
-#. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:2047
-msgid "The device can now be safely removed"
-msgstr "该设备现在可以安全删除"
-
-#: rapid/rapid.py:2053
-#, python-format
-msgid "%(noFiles)s %(filetypes)s downloaded"
+#: rapid/rapid.py:2270
+msgid "Pause"
 msgstr ""
 
-#: rapid/rapid.py:2056
-#, python-format
-msgid "%(noFiles)s %(filetypes)s failed to download"
-msgstr "%(noFiles)s %(filetypes)s 下载失败"
-
-#: rapid/rapid.py:2059 rapid/rapid.py:5901
-msgid "warnings"
-msgstr "警告"
-
-#: rapid/rapid.py:2061 rapid/rapid.py:5905
-msgid "errors"
-msgstr "错误"
-
-#: rapid/rapid.py:2091
-#, python-format
-msgid "Source: %s\n"
-msgstr "音频入口：%s\n"
-
-#: rapid/rapid.py:2093
-#, python-format
-msgid "Device: %s\n"
-msgstr "设备：%s\n"
-
-#: rapid/rapid.py:2094
-#, python-format
-msgid "Destination: %s"
-msgstr ""
-
-#: rapid/rapid.py:2095 rapid/rapid.py:2098
-msgid "Could not create temporary download directory"
-msgstr "无法创建临时下载目录"
-
-#: rapid/rapid.py:2098
-msgid "Error:"
-msgstr "错误:"
-
-#: rapid/rapid.py:2122
-msgid "Backup path does not exist"
-msgstr "备份路径不存在"
-
-#: rapid/rapid.py:2123
-#, python-format
-msgid "The path %s could not be created"
-msgstr "无法创建路径 %s"
-
-#: rapid/rapid.py:2124
-msgid "No backups can occur"
-msgstr "没有备份任务启动"
-
-#: rapid/rapid.py:2153
+#: rapid/rapid.py:2376
 #, python-format
 msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"%(problem)s"
+"These download folders are invalid:\n"
+"%(folder1)s\n"
+"%(folder2)s"
 msgstr ""
-"源: %(source)s\n"
-"目的: %(destination)s\n"
-"%(problem)s"
 
-#: rapid/rapid.py:2184 rapid/rapid.py:2530 rapid/rapid.py:2565
-#: rapid/rapid.py:2593 rapid/rapid.py:2624 rapid/rapid.py:2643
+#: rapid/rapid.py:2379
 #, python-format
 msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
+"This download folder is invalid:\n"
+"%s"
 msgstr ""
-"音频输入: %(source)s\n"
-"音频输出: %(destination)s"
-
-#. hopefully inst will never be None, but just to be safe...
-#: rapid/rapid.py:2199
-msgid "Please check your system and try again."
-msgstr "请检查您的系统并重试"
 
-#: rapid/rapid.py:2219
-msgid "Photos detected with the same filenames, but taken at different times"
-msgstr "检测到文件名相同，但拍摄时间不同的照片。"
-
-#: rapid/rapid.py:2259
-msgid "Photo has already been downloaded"
-msgstr "照片已经下载过"
-
-#: rapid/rapid.py:2260 rapid/rapid.py:2659
-#, python-format
-msgid "Source: %(source)s"
-msgstr "源: %(source)s"
-
-#. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:2458
-msgid "New day has started - resetting 'Downloads Today' sequence number"
-msgstr "新的一天已开始—正在重置“今日下载”序列号"
+#: rapid/rapid.py:2380
+msgid "Download cannot proceed"
+msgstr "下载无法进行"
 
-#: rapid/rapid.py:2529
+#: rapid/rapid.py:2388 rapid/rapid.py:2391
 #, python-format
-msgid "Backup of %(file_type)s already exists"
+msgid "No backup device contains a valid folder for backing up %(filetype)s"
 msgstr ""
 
-#: rapid/rapid.py:2533
-#, python-format
-msgid "Backup %(file_type)s overwritten"
-msgstr ""
+#: rapid/rapid.py:2388 rapid/rapid.py:2843 rapid/rapid.py:3680
+#: rapid/rpdfile.py:139
+msgid "photos"
+msgstr "相片"
 
-#: rapid/rapid.py:2537
-#, python-format
-msgid "%(file_type)s not backed up to %(volume)s"
-msgstr ""
+#: rapid/rapid.py:2391 rapid/rapid.py:2838 rapid/rapid.py:3682
+#: rapid/rpdfile.py:134
+msgid "videos"
+msgstr "视频"
 
-#: rapid/rapid.py:2539
-#, python-format
-msgid "%(file_type)s not backed up"
+#: rapid/rapid.py:2393
+msgid "Backup problem"
 msgstr ""
 
-#: rapid/rapid.py:2562 rapid/rapid.py:2590 rapid/rapid.py:2623
-#: rapid/rapid.py:2642
-msgid "Backing up error"
-msgstr "备份错误"
+#: rapid/rapid.py:2802
+msgid "About 1 second remaining"
+msgstr "剩余约1秒钟"
 
-#: rapid/rapid.py:2563 rapid/rapid.py:2591
+#: rapid/rapid.py:2804
 #, python-format
-msgid "Destination directory could not be created: %(directory)s\n"
-msgstr ""
+msgid "About %i seconds remaining"
+msgstr "约剩余 %i 秒"
 
-#: rapid/rapid.py:2567 rapid/rapid.py:2626
-#, python-format
-msgid "Error: %(inst)s"
-msgstr "错误: %(inst)s"
+#: rapid/rapid.py:2806
+msgid "About 1 minute remaining"
+msgstr "约剩余 1 秒钟"
 
-#: rapid/rapid.py:2568 rapid/rapid.py:2596 rapid/rapid.py:2627
-#: rapid/rapid.py:2646
+#. 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:2811
 #, python-format
-msgid "The %(file_type)s was not backed up."
-msgstr ""
+msgid "About %(minutes)i:%(seconds)02i minutes remaining"
+msgstr "约剩余 %(minutes)i:%(seconds)02i 分钟"
 
-#: rapid/rapid.py:2595 rapid/rapid.py:2645
-#, python-format
-msgid "Error: %(errno)s %(strerror)s"
-msgstr ""
+#: rapid/rapid.py:2833 rapid/rpdfile.py:129
+msgid "photos and videos"
+msgstr "图片和视频"
 
-#: rapid/rapid.py:2658
-#, python-format
-msgid "%(file_type)s could not be backed up"
-msgstr "%(file_type)s 不能被备份"
+#: rapid/rapid.py:2835 rapid/rpdfile.py:131
+msgid "photos or videos"
+msgstr "照片或视频"
 
-#: rapid/rapid.py:2661
-msgid "No suitable backup volume was found"
-msgstr "没有找到合适的备份卷"
+#: rapid/rapid.py:2840 rapid/preferencesdialog.py:1632 rapid/rpdfile.py:136
+#: rapid/rpdfile.py:305
+msgid "video"
+msgstr "视频"
 
-#: rapid/rapid.py:2663
-msgid "A backup location was not found"
-msgstr "没有找到备份位置"
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:2845 rapid/preferencesdialog.py:1631 rapid/rpdfile.py:141
+#: rapid/rpdfile.py:286
+msgid "photo"
+msgstr "照片"
 
-#: rapid/rapid.py:2717
+#: rapid/rapid.py:2872
 #, python-format
-msgid "This device has no %(types_searched_for)s to download from."
+msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2813
+#: rapid/rapid.py:2876
 #, python-format
-msgid "Download has started from %s"
-msgstr "下载已经从 %s 处开始"
+msgid "%(noFiles)s %(filetypes)s failed to download"
+msgstr "%(noFiles)s %(filetypes)s 下载失败"
 
-#: rapid/rapid.py:2817
-#, python-format
-msgid "Attempting to download %s files"
-msgstr "正在尝试下载 %s 文件"
+#: rapid/rapid.py:2879 rapid/rapid.py:2935
+msgid "warnings"
+msgstr "警告"
 
-#. reset the progress bar to update the status of this download attempt
-#: rapid/rapid.py:2849 rapid/rapid.py:2917
-#, python-format
-msgid "%(number)s of %(total)s %(filetypes)s"
-msgstr "%(number)s/%(total)s %(filetypes)s"
+#: rapid/rapid.py:2892
+msgid "All downloads complete"
+msgstr "所有下载已完成"
 
-#: rapid/rapid.py:2913
+#: rapid/rapid.py:2898 rapid/rapid.py:2907 rapid/rapid.py:2916
+#: rapid/rapid.py:2925 rapid/rapid.py:2933
 #, python-format
-msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
+msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: rapid/rapid.py:2938 rapid/rapid.py:2942
-msgid "Could not delete photo or video from device"
-msgstr "无法从设备上删除照片或视频"
-
-#: rapid/rapid.py:2939
+#: rapid/rapid.py:2900 rapid/rapid.py:2918
 #, python-format
-msgid ""
-"Photo: %(source)s\n"
-"Error: %(errno)s %(strerror)s"
+msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2943
+#: rapid/rapid.py:2909 rapid/rapid.py:2927
 #, python-format
-msgid "Photo: %(source)s"
-msgstr "照片：%(source)s"
+msgid "%(filetype)s failed to download"
+msgstr "%(filetype)s 下载失败"
 
-#: rapid/rapid.py:2945
+#. e.g.: 3 of 205 photos and videos (202 remaining)
+#: rapid/rapid.py:2970
 #, python-format
-msgid "Deleted %(number)i %(filetypes)s from device"
+msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr ""
 
-#: rapid/rapid.py:2958
+#. e.g.: 205 of 205 photos and videos
+#: rapid/rapid.py:2977
 #, python-format
-msgid "Download complete from %s"
-msgstr "从%s开始下载完成"
-
-#. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:3073 rapid/rapid.py:3542
-msgid "Device"
-msgstr "设备"
-
-#. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:3078 rapid/rapid.py:3531
-msgid "Size"
-msgstr "容量"
-
-#: rapid/rapid.py:3081
-msgid "Download Progress"
-msgstr "下载进度"
-
-#: rapid/rapid.py:3169
-msgid "Downloading From Cameras"
-msgstr "正在从相机下载"
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr "%(number)s/%(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3175
-msgid "Downloading directly from a camera may work poorly or not at all"
+#: rapid/rapid.py:3331
+msgid "From"
 msgstr ""
 
-#: rapid/rapid.py:3176
-msgid ""
-"Downloading from a card reader always works and is generally much faster. It "
-"is strongly recommended to use a card reader."
-msgstr "从读卡器下载通常没有什么问题，而且速度也快。强烈建议使用读卡器。"
-
-#: rapid/rapid.py:3190
-msgid "_Show this message again"
+#: rapid/rapid.py:3339
+msgid "Auto Detect"
 msgstr ""
 
-#: rapid/rapid.py:3225
-msgid "Device Detected"
-msgstr "检测到驱动器"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3234
-msgid ""
-"Should this device or partition be used to download photos or videos from?"
-msgstr "要使用此设备或分区来下载照片或视频吗？"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3253
-msgid "_Remember this choice"
-msgstr "记住此选择 (_R)"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3290
-#, python-format
-msgid "%s selected for downloading from"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3293
-msgid "This device or partition will always be used to download from"
-msgstr "此设备或分区总是用来下载照片或视频"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3296
+#: rapid/rapid.py:3343 rapid/preferencesdialog.py:1337
 #, python-format
-msgid "%s rejected as a download device"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3299
-msgid "This device or partition will never be used to download from"
-msgstr "此设备或分区不再用于下载"
+msgid "Select a folder containing %(file_types)s"
+msgstr "选择目录保存 %(file_types)s"
 
-#: rapid/rapid.py:3306
-msgid "Remove all Job Codes?"
+#: rapid/rapid.py:3384
+msgid "Copy"
 msgstr ""
 
-#: rapid/rapid.py:3323
-msgid "Should all Job Codes be removed?"
+#: rapid/rapid.py:3397
+msgid "Move"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3351
-msgid "Enter a Job Code"
-msgstr "输入一个任务代码"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3370
-msgid "Enter a new Job Code, or select a previous one"
+#: rapid/rapid.py:3419
+msgid "To"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3373
-msgid "Enter a new Job Code"
+#: rapid/rapid.py:3426 rapid/rapid.py:4128
+msgid "Photos:"
 msgstr ""
 
-#: rapid/rapid.py:3378 rapid/rapid.py:4640
-msgid "Job Code:"
-msgstr "任务代码："
-
-#: rapid/rapid.py:3425
-msgid "Job Code entered"
-msgstr "任务代码已输入"
-
-#: rapid/rapid.py:3427
-msgid "Job Code not entered"
-msgstr "任务代码还没输入"
-
-#: rapid/rapid.py:3477
-msgid "Status"
-msgstr "状态"
-
-#: rapid/rapid.py:3485
-msgid "Type"
-msgstr "类型"
+#: rapid/rapid.py:3429 rapid/preferencesdialog.py:1174
+msgid "Select a folder to download photos to"
+msgstr "选择下载相片的目录..."
 
-#: rapid/rapid.py:3494 rapid/rapid.py:5067 rapid/rapid.py:5069
-msgid "Photo"
+#: rapid/rapid.py:3441 rapid/rapid.py:4128
+msgid "Videos:"
 msgstr ""
 
-#: rapid/rapid.py:3496
-msgid "File"
-msgstr "文件"
+#: rapid/rapid.py:3443 rapid/preferencesdialog.py:1192
+msgid "Select a folder to download videos to"
+msgstr "选择下载视频的目录..."
 
-#: rapid/rapid.py:3511
-msgid "Job Code"
+#: rapid/rapid.py:3650
+msgid "and"
 msgstr ""
 
-#: rapid/rapid.py:3521
-msgid "Date"
-msgstr "日期"
-
-#: rapid/rapid.py:3553 rapid/renamesubfolderprefs.py:194
-msgid "Filename"
-msgstr "文件名"
-
-#: rapid/rapid.py:3564
-msgid "Path"
-msgstr "路径"
-
-#: rapid/rapid.py:3974
-#, python-format
-msgid "%(filetype)s was downloaded successfully"
-msgstr ""
+#: rapid/rapid.py:3655
+msgid "Using backup devices"
+msgstr "正在使用备份驱动器"
 
-#: rapid/rapid.py:3976
-#, python-format
-msgid "%(filetype)s was not downloaded"
-msgstr "%(filetype)s 没有被下载"
+#: rapid/rapid.py:3657
+msgid "Using backup device"
+msgstr "正在使用备份驱动器"
 
-#: rapid/rapid.py:3978
-#, python-format
-msgid "%(filetype)s was downloaded with warnings"
-msgstr ""
+#: rapid/rapid.py:3659
+msgid "No backup devices detected"
+msgstr "没有检测到备份驱动器"
 
-#: rapid/rapid.py:3980
-#, python-format
-msgid "%(filetype)s was downloaded but there were problems backing up"
+#: rapid/rapid.py:3686
+msgid "Free space:"
 msgstr ""
 
-#: rapid/rapid.py:3982
+#. (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:3698
 #, python-format
-msgid "%(filetype)s was neither downloaded nor backed up"
+msgid "(%(file_type)s)"
 msgstr ""
 
-#: rapid/rapid.py:3984
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#: rapid/rapid.py:3702
 #, python-format
-msgid "%(filetype)s is ready to be downloaded"
+msgid "%(free)s %(file_type)s"
 msgstr ""
 
-#: rapid/rapid.py:3986
-#, python-format
-msgid "%(filetype)s is about to be downloaded"
+#. Inserted in the middle of the statusbar message concerning the amount of freespace
+#. Used to differentiate between two different file systems
+#. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
+#: rapid/rapid.py:3707
+msgid "; "
 msgstr ""
 
-#: rapid/rapid.py:3988
-#, python-format
-msgid "%(filetype)s will be downloaded with warnings"
+#. Inserted at the end of the statusbar message concerning the amount of freespace
+#. Used to differentiate between two different file systems
+#. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
+#: rapid/rapid.py:3712
+msgid "."
 msgstr ""
 
-#: rapid/rapid.py:3990
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#. e.g. 14.7GB available
+#: rapid/rapid.py:3718
 #, python-format
-msgid "%(filetype)s cannot be downloaded"
+msgid "%(free)s free"
 msgstr ""
 
-#: rapid/rapid.py:4662
-msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
-msgstr ""
-
-#: rapid/rapid.py:5034
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3726
 #, python-format
-msgid "%(free)s available"
+msgid "Backing up photos and videos to %(path)s"
 msgstr ""
 
 #. user manually specified backup location
-#: rapid/rapid.py:5040
+#: rapid/rapid.py:3729
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "备份至 %(path)s"
 
-#: rapid/rapid.py:5045
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3732
 #, python-format
-msgid "%(freespace)s. %(backuppaths)s."
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr ""
 
-#: rapid/rapid.py:5054
+#: rapid/rapid.py:3739
 #, python-format
-msgid ""
-"Sorry, this device location does not exist:\n"
-"%(path)s\n"
-"\n"
-"Please resolve the problem, or modify your preferences."
-msgstr "抱歉，此驱动器位置不存在：%(path)s"
+msgid "%(freespace)s. %(backuppaths)s."
+msgstr ""
 
-#: rapid/rapid.py:5058
-msgid "Problem with Device Location Folder"
-msgstr "驱动文件夹位置存在问题"
+#: rapid/rapid.py:3768
+msgid "Program preferences are invalid"
+msgstr ""
 
-#: rapid/rapid.py:5067
+#: rapid/rapid.py:3910 rapid/rpdfile.py:287
+msgid "Photo"
+msgstr ""
+
+#: rapid/rapid.py:3912 rapid/rpdfile.py:306
 msgid "Video"
 msgstr "视频"
 
-#: rapid/rapid.py:5074
+#: rapid/rapid.py:3921
 #, python-format
-msgid "The %(file_type)s Download Folder does not exist.\n"
+msgid "%(file_type)s download folder does not exist"
 msgstr ""
 
-#: rapid/rapid.py:5083
+#: rapid/rapid.py:3923 rapid/rapid.py:3937 rapid/rapid.py:3950
 #, python-format
-msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
+msgid "Folder: %s"
 msgstr ""
 
-#: rapid/rapid.py:5088
-msgid ""
-"Sorry, problems were encountered with your download folders. Please fix the "
-"problems or modify the preferences.\n"
-"\n"
+#: rapid/rapid.py:3935
+#, python-format
+msgid "%(file_type)s download folder is invalid"
 msgstr ""
 
-#: rapid/rapid.py:5091
-msgid "Problem with Download Folder"
+#: rapid/rapid.py:3948
+#, python-format
+msgid "%(file_type)s download folder is not writable"
 msgstr ""
 
-#: rapid/rapid.py:5093
-msgid "Problem with Download Folders"
+#: rapid/rapid.py:4034
+msgid "Thumbnails"
 msgstr ""
 
-#: rapid/rapid.py:5106
-msgid "Some preferences will be reset."
-msgstr "某些首选项将被重置"
-
-#: rapid/rapid.py:5139
-msgid "Displaying warning about downloading directly from camera"
-msgstr "显示关于直接从照相机下载的警告"
-
-#: rapid/rapid.py:5149
-#, python-format
-msgid "Prompting whether to use %s"
-msgstr "提示是否使用 %s"
-
-#: rapid/rapid.py:5176
-msgid "Prompting for Job Code"
-msgstr "提示作业代码"
-
-#: rapid/rapid.py:5180
-msgid "Already prompting for Job Code, do not prompt again"
-msgstr "已经提示过作业代码，无需再提示"
-
-#: rapid/rapid.py:5197
-msgid "Starting downloads"
-msgstr "开始下载"
-
-#. autostart is true
-#: rapid/rapid.py:5201
-msgid "Starting downloads that have been waiting for a Job Code"
-msgstr "开始下载已经在等待作业代码的下载任务"
-
-#: rapid/rapid.py:5248
-#, python-format
-msgid "Creating photo download folder %(folder)s"
-msgstr "创建照片下载目录 %(folder)s"
-
-#: rapid/rapid.py:5253
-#, python-format
-msgid "Failed to create default photo download folder %(folder)s"
-msgstr "创建照片下载目录 %(folder)s 失败"
-
-#: rapid/rapid.py:5257
-#, python-format
-msgid "Creating video download folder %(folder)s"
-msgstr "创建视频下载目录 %(folder)s"
-
-#: rapid/rapid.py:5262
+#. 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:4089
 #, python-format
-msgid "Failed to create default video download folder %(folder)s"
-msgstr "创建视频下载目录 %(folder)s 失败"
-
-#: rapid/rapid.py:5287
 msgid ""
-"A newer version of this program was previously run on this computer.\n"
-"\n"
+"display program information on the command line as the program runs "
+"(default: %default)"
 msgstr ""
 
-#: rapid/rapid.py:5289
-msgid ""
-"Program preferences appear to be valid, but please check them to ensure "
-"correct operation."
-msgstr "程序首选项似乎是有效的，但请检查以确保正确的操作。"
-
-#: rapid/rapid.py:5291
-msgid "Sorry, some preferences are invalid and will be reset."
-msgstr "抱歉，一些首选项设置无效，它们将被重置。"
-
-#: rapid/rapid.py:5292
-msgid "Warning:"
+#: rapid/rapid.py:4090
+msgid "display debugging information when run from the command line"
 msgstr ""
 
-#: rapid/rapid.py:5297
-msgid ""
-"This version of the program is newer than the previously run version. "
-"Checking preferences."
-msgstr "此版本的程序比之前运行的版本更新。正在检查首选项设置。"
+#: rapid/rapid.py:4091
+msgid "only output errors to the command line"
+msgstr "只在命令行显示错误信息"
 
-#: rapid/rapid.py:5304
-msgid "Preferences were modified."
-msgstr "首选项已修改"
+#. image file extensions are recognized RAW files plus TIFF and JPG
+#: rapid/rapid.py:4093
+msgid "list photo and video file extensions the program recognizes and exit"
+msgstr ""
 
-#: rapid/rapid.py:5305
+#: rapid/rapid.py:4095
 msgid ""
-"This version of the program uses different preferences than the old version. "
-"Your preferences have been updated.\n"
-"\n"
-"Please check them to ensure correct operation."
-msgstr "此版本程序使用与旧版本不同的首选项设置。你的首选项设置已经更新。"
-
-#: rapid/rapid.py:5309
-msgid "No preferences needed to be changed."
-msgstr "没有首选项需要变更。"
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
+msgstr ""
 
-#: rapid/rapid.py:5311
+#: rapid/rapid.py:4096
 msgid ""
-"This version of the program uses different preferences than the old version. "
-"Some of your previous preferences were invalid, and could not be updated. "
-"They will be reset."
-msgstr "此版本的程序使用跟旧版本不同的首选项。之前的一些首选项已经无效且无法更新，它们将被重置。"
-
-#: rapid/rapid.py:5321
-msgid "Problem using pynotify."
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
 msgstr ""
 
-#: rapid/rapid.py:5337
-msgid "Failed to receive pynotify server capabilities."
-msgstr "接收pynotify服务器功能失败"
+#: rapid/rapid.py:4097
+msgid "reset all program settings and preferences and exit"
+msgstr "重置所有程序设置和首选项并退出"
 
-#: rapid/rapid.py:5348
+#: rapid/rapid.py:4110
 msgid ""
-"Warning: desktop environment notification server is incorrectly configured."
-msgstr "警告：桌面环境通知服务器配置不正确。"
-
-#: rapid/rapid.py:5396
-msgid "and"
+"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:5401
-msgid "Using backup devices"
-msgstr "正在使用备份驱动器"
-
-#: rapid/rapid.py:5403
-msgid "Using backup device"
-msgstr "正在使用备份驱动器"
-
-#: rapid/rapid.py:5405
-msgid "No backup devices detected"
-msgstr "没有检测到备份驱动器"
-
-#: rapid/rapid.py:5455 rapid/rapid.py:5617
+#: rapid/rapid.py:4133
 #, python-format
-msgid "Device %(device)s (%(path)s) ignored"
-msgstr "忽略设备 %(device)s (%(path)s)"
-
-#: rapid/rapid.py:5576
-#, python-format
-msgid "Detected %(device)s with path %(path)s"
-msgstr "检测到驱动器 %(device)s 路径 %(path)s"
-
-#: rapid/rapid.py:5580
-msgid "Automatically start download is true"
-msgstr "自动开始下载值为真"
+msgid "and %s"
+msgstr "和 %s"
 
-#: rapid/rapid.py:5582
-msgid "Automatically start download is false"
-msgstr "自动开始下载值为假"
+#: rapid/rapid.py:4141
+msgid "All settings and preferences have been reset"
+msgstr ""
 
-#: rapid/rapid.py:5635
-msgid "Using manually specified path"
-msgstr "使用手动指定的路径"
+#: rapid/backupfile.py:149 rapid/backupfile.py:221
+msgid "Backing up error"
+msgstr "备份错误"
 
-#. the user is trying to backup to a device that is currently being downloaded from..... we don't normally allow that, but what to do?
-#: rapid/rapid.py:5703
+#: rapid/backupfile.py:151
 #, python-format
-msgid "Warning: backup device %(device)s is currently being downloaded from"
-msgstr "警告：备份驱动器 %(device)s 当前正在用于下载"
-
-#: rapid/rapid.py:5719
-msgid "D_ownload Selected"
+msgid "Destination directory could not be created: %(directory)s\n"
 msgstr ""
 
-#: rapid/rapid.py:5822 rapid/rapid.py:5873
-msgid "All downloads complete"
-msgstr "所有下载已完成"
-
-#: rapid/rapid.py:5837
-msgid "MB/s"
-msgstr "兆/秒"
-
-#: rapid/rapid.py:5847
-msgid "About 1 second remaining"
-msgstr "剩余约1秒钟"
-
-#: rapid/rapid.py:5849
+#: rapid/backupfile.py:153 rapid/backupfile.py:170 rapid/backupfile.py:223
+#: rapid/subfolderfile.py:202
 #, python-format
-msgid "About %i seconds remaining"
-msgstr "约剩余 %i 秒"
-
-#: rapid/rapid.py:5851
-msgid "About 1 minute remaining"
-msgstr "约剩余 1 秒钟"
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"音频输入: %(source)s\n"
+"音频输出: %(destination)s"
 
-#. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
-#. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
-#. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:5856
+#: rapid/backupfile.py:156 rapid/backupfile.py:225
 #, python-format
-msgid "About %(minutes)i:%(seconds)02i minutes remaining"
-msgstr "约剩余 %(minutes)i:%(seconds)02i 分钟"
+msgid "Error: %(inst)s"
+msgstr "错误: %(inst)s"
 
-#: rapid/rapid.py:5876 rapid/rapid.py:5882 rapid/rapid.py:5888
-#: rapid/rapid.py:5894 rapid/rapid.py:5899 rapid/rapid.py:5903
+#: rapid/backupfile.py:163
 #, python-format
-msgid "%(number)s %(numberdownloaded)s"
+msgid "Backup %(file_type)s overwritten"
 msgstr ""
 
-#: rapid/rapid.py:5878 rapid/rapid.py:5890
+#: rapid/backupfile.py:166
 #, python-format
-msgid "%(filetype)s downloaded"
+msgid "%(file_type)s not backed up"
 msgstr ""
 
-#: rapid/rapid.py:5884 rapid/rapid.py:5896
+#: rapid/backupfile.py:168
 #, python-format
-msgid "%(filetype)s failed to download"
-msgstr "%(filetype)s 下载失败"
-
-#: rapid/rapid.py:6070
-msgid "_Resume"
+msgid "Backup of %(file_type)s already exists"
 msgstr ""
 
-#: rapid/rapid.py:6073
-msgid "_Download All"
-msgstr "全部下载(_D)"
-
-#. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:6082
-msgid "_Pause"
-msgstr "暂停(_P)"
-
-#: rapid/rapid.py:6194
-msgid "Download device settings preferences were changed."
-msgstr "下载驱动器设置已更改"
-
-#: rapid/rapid.py:6206
-msgid "Backup preferences were changed."
-msgstr "备份首选项已更改"
-
-#: rapid/rapid.py:6212
-msgid "Subfolder and filename preferences were changed."
-msgstr "子目录和文件名首选项已更改"
-
-#: rapid/rapid.py:6223
-msgid "Download folder preferences were changed."
-msgstr "下载文件夹首选项已更改"
-
-#: rapid/rapid.py:6422
-msgid "Goodbye"
-msgstr "再见"
-
-#. Translators: this text is displayed to the user when they request information on the command line options.
-#. The text %default should not be modified or left out.
-#: rapid/rapid.py:6433
+#: rapid/backupfile.py:209 rapid/copyfiles.py:201 rapid/copyfiles.py:219
+#: rapid/subfolderfile.py:217 rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:456
 #, python-format
 msgid ""
-"display program information on the command line as the program runs "
-"(default: %default)"
+"%(problem)s\n"
+"File: %(file)s"
 msgstr ""
 
-#: rapid/rapid.py:6434
-msgid "display debugging information when run from the command line"
+#: rapid/copyfiles.py:214
+msgid "An unknown error occurred"
 msgstr ""
 
-#: rapid/rapid.py:6435
-msgid "only output errors to the command line"
-msgstr "只在命令行显示错误信息"
-
-#. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:6437
-msgid "list photo and video file extensions the program recognizes and exit"
-msgstr ""
-
-#: rapid/rapid.py:6438
-msgid "reset all program settings and preferences and exit"
-msgstr "重置所有程序设置和首选项并退出"
-
-#: rapid/rapid.py:6452
-msgid "Photos:"
-msgstr ""
-
-#: rapid/rapid.py:6452
-msgid "Videos:"
-msgstr ""
-
-#: rapid/rapid.py:6457
-#, python-format
-msgid "and %s"
-msgstr "和 %s"
-
-#: rapid/rapid.py:6465
-msgid "All settings and preferences have been reset"
-msgstr ""
+#: rapid/device.py:80
+msgid "Device Detected"
+msgstr "检测到驱动器"
 
-#. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:6469 rapid/rapid.py:6470 rapid/rapid.py:6472
-#: rapid/rapid.py:6477 rapid/rapid.py:6481
-msgid "Using"
-msgstr ""
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/device.py:89
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
+msgstr "要使用此设备或分区来下载照片或视频吗？"
 
-#: rapid/rapid.py:6474
-msgid "\n"
-msgstr "\n"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/device.py:108
+msgid "_Remember this choice"
+msgstr "记住此选择 (_R)"
 
-#. this application is already running
-#: rapid/rapid.py:6498
-#, python-format
-msgid "%s is already running"
-msgstr "%s 已在运行"
+#: rapid/downloadtracker.py:299
+msgid "MB/s"
+msgstr "兆/秒"
 
-#: rapid/renamesubfolderprefs.py:192
+#: rapid/generatenameconfig.py:151
 msgid "Date time"
 msgstr "日期时间"
 
-#: rapid/renamesubfolderprefs.py:193
+#: rapid/generatenameconfig.py:152
 msgid "Text"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:195
+#: rapid/generatenameconfig.py:153
+msgid "Filename"
+msgstr "文件名"
+
+#: rapid/generatenameconfig.py:154
 msgid "Metadata"
 msgstr "元数据"
 
-#: rapid/renamesubfolderprefs.py:196
+#: rapid/generatenameconfig.py:155
 msgid "Sequences"
 msgstr "序列"
 
-#: rapid/renamesubfolderprefs.py:199
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/generatenameconfig.py:157 rapid/preferencesdialog.py:577
+msgid "Job code"
+msgstr "任务代码"
+
+#: rapid/generatenameconfig.py:158
 msgid "Image date"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:200
+#: rapid/generatenameconfig.py:159
 msgid "Video date"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:201
+#: rapid/generatenameconfig.py:160
 msgid "Today"
-msgstr ""
+msgstr "今日"
 
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/generatenameconfig.py:161
 msgid "Yesterday"
-msgstr ""
+msgstr "昨天"
 
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/renamesubfolderprefs.py:204
+#: rapid/generatenameconfig.py:163
 msgid "Download time"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:206
+#: rapid/generatenameconfig.py:165
 msgid "Name + extension"
 msgstr "名称+扩展名"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:208
+#: rapid/generatenameconfig.py:167
 msgid "Name"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:210
+#: rapid/generatenameconfig.py:169
 msgid "Extension"
 msgstr "扩展名"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:212
+#: rapid/generatenameconfig.py:171
 msgid "Image number"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:213
+#: rapid/generatenameconfig.py:172
 msgid "Video number"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:215
+#: rapid/generatenameconfig.py:174
 msgid "Aperture"
 msgstr "光圈"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:217
+#: rapid/generatenameconfig.py:176
 msgid "ISO"
-msgstr ""
+msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:219
+#: rapid/generatenameconfig.py:178
 msgid "Exposure time"
 msgstr "曝光时间"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:221
+#: rapid/generatenameconfig.py:180
 msgid "Focal length"
 msgstr "焦距"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:223
+#: 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/renamesubfolderprefs.py:225
+#: rapid/generatenameconfig.py:184
 msgid "Camera model"
 msgstr "相机型号"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:227
+#: 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/renamesubfolderprefs.py:229
+#: 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/renamesubfolderprefs.py:231
+#: rapid/generatenameconfig.py:190
 msgid "Serial number"
 msgstr "序列号"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:233
+#: rapid/generatenameconfig.py:192
 msgid "Shutter count"
 msgstr "快门数"
 
+#. File number currently refers to the Exif value Exif.Canon.FileNumber
+#: rapid/generatenameconfig.py:194
+msgid "File number"
+msgstr ""
+
+#. Only the folder component of the Exif.Canon.FileNumber value
+#: rapid/generatenameconfig.py:196
+msgid "Folder only"
+msgstr ""
+
+#. The folder and file component of the Exif.Canon.FileNumber value
+#: rapid/generatenameconfig.py:198
+msgid "Folder and file"
+msgstr ""
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:235
+#: rapid/generatenameconfig.py:200
 msgid "Owner name"
 msgstr "机主姓名"
 
-#: rapid/renamesubfolderprefs.py:236
+#: rapid/generatenameconfig.py:201
 msgid "Codec"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:237
+#: rapid/generatenameconfig.py:202
 msgid "Width"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/generatenameconfig.py:203
 msgid "Height"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:239
+#: rapid/generatenameconfig.py:204
 msgid "Length"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:240
+#: rapid/generatenameconfig.py:205
 msgid "Frames Per Second"
 msgstr "每秒帧数"
 
+#: rapid/generatenameconfig.py:206
+msgid "Artist"
+msgstr ""
+
+#: 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/renamesubfolderprefs.py:242
+#: 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/renamesubfolderprefs.py:244
+#: 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/renamesubfolderprefs.py:246
+#: 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/renamesubfolderprefs.py:248
+#: 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/renamesubfolderprefs.py:250
+#: 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/renamesubfolderprefs.py:252
+#: 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/renamesubfolderprefs.py:254
+#: rapid/generatenameconfig.py:221
 msgid "Last digit"
 msgstr "最后1位"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:256
+#: rapid/generatenameconfig.py:223
 msgid "Last 2 digits"
 msgstr "最后2位"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:258
+#: rapid/generatenameconfig.py:225
 msgid "Last 3 digits"
 msgstr "最后3位"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:260
+#: rapid/generatenameconfig.py:227
 msgid "Last 4 digits"
 msgstr "最后4位"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:262
+#: 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/renamesubfolderprefs.py:264
+#: 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/renamesubfolderprefs.py:266
+#: rapid/generatenameconfig.py:233
 msgid "lowercase"
-msgstr ""
+msgstr "小写"
 
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/generatenameconfig.py:234
 msgid "One digit"
 msgstr "一位"
 
-#: rapid/renamesubfolderprefs.py:268
+#: rapid/generatenameconfig.py:235
 msgid "Two digits"
 msgstr "两位"
 
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/generatenameconfig.py:236
 msgid "Three digits"
 msgstr "三位"
 
-#: rapid/renamesubfolderprefs.py:270
+#: rapid/generatenameconfig.py:237
 msgid "Four digits"
 msgstr "四位"
 
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/generatenameconfig.py:238
 msgid "Five digits"
 msgstr "五位"
 
-#: rapid/renamesubfolderprefs.py:272
+#: rapid/generatenameconfig.py:239
 msgid "Six digits"
 msgstr "六位"
 
-#: rapid/renamesubfolderprefs.py:273
+#: 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/renamesubfolderprefs.py:275
+#: 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/renamesubfolderprefs.py:277
+#: rapid/generatenameconfig.py:244
 msgid "YYYYMMDD"
 msgstr "YYYYMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: 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/renamesubfolderprefs.py:281
+#: rapid/generatenameconfig.py:248
 msgid "YYMMDD"
 msgstr "YYMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/generatenameconfig.py:250
 msgid "YY-MM-DD"
 msgstr "YY-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/generatenameconfig.py:252
 msgid "MMDDYYYY"
 msgstr "MMDDYYYY"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/generatenameconfig.py:254
 msgid "MMDDYY"
 msgstr "MMDDYY"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: 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/renamesubfolderprefs.py:291
+#: rapid/generatenameconfig.py:258
 msgid "DDMMYYYY"
 msgstr "DDMMYYYY"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
+#: rapid/generatenameconfig.py:260
 msgid "DDMMYY"
 msgstr "DDMMYY"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:295
+#: 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/renamesubfolderprefs.py:297
+#: 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/renamesubfolderprefs.py:299
+#: 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/renamesubfolderprefs.py:301
+#: 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/renamesubfolderprefs.py:303
+#: 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 "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:305
+#: 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/renamesubfolderprefs.py:307
+#: 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/renamesubfolderprefs.py:309
+#: 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/renamesubfolderprefs.py:311
+#: 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/renamesubfolderprefs.py:313
+#: rapid/generatenameconfig.py:284
 msgid "MM (minutes)"
 msgstr "MM (分钟)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:315
+#: rapid/generatenameconfig.py:286
 msgid "SS"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:800
-#, python-format
-msgid ""
-"Preference key '%(key)s' is invalid.\n"
-"Expected one of %(value)s"
-msgstr ""
-
-#: rapid/renamesubfolderprefs.py:807
-#, python-format
-msgid "Preference value '%(value)s' is invalid"
-msgstr "偏好值 '%(value)s' 无效"
-
-#: rapid/renamesubfolderprefs.py:811
-msgid "These preferences are not well formed:"
-msgstr ""
-
-#: rapid/renamesubfolderprefs.py:1524
+#: rapid/preferencesdialog.py:374
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "子目录首选项不应以 %s 开头"
 
-#: rapid/renamesubfolderprefs.py:1526
+#: rapid/preferencesdialog.py:376
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "子目录首选项不应以 %s 结尾"
 
-#: rapid/renamesubfolderprefs.py:1530
+#: rapid/preferencesdialog.py:380
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "子目录首选项不应包含两个相邻的 %s"
 
-#: rapid/glade3/rapid.glade.h:1
-msgid " "
-msgstr " "
+#: rapid/preferencesdialog.py:439 rapid/preferencesdialog.py:700
+msgid "Remove all Job Codes?"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:2
-msgid "      "
-msgstr "      "
+#: rapid/preferencesdialog.py:440 rapid/preferencesdialog.py:717
+msgid "Should all Job Codes be removed?"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:3
-msgid " hh:mm"
-msgstr " hh:mm"
+#: rapid/preferencesdialog.py:446
+msgid "Remove all Remembered Paths?"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:4
-msgid ":"
+#: rapid/preferencesdialog.py:447
+msgid "Should all remembered paths be removed?"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:5
-msgid "<b>Backup</b>"
-msgstr "<b>备份</b>"
+#: rapid/preferencesdialog.py:453
+msgid "Remove all Ignored Paths?"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:6
-msgid "<b>Compatibility with Other Operating Systems</b>"
-msgstr "<b>兼容其它操作系统</b>"
+#: rapid/preferencesdialog.py:454
+msgid "Should all ignored paths be removed?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:465
+msgid "Error in Photo Rename preferences"
+msgstr "照片重命名设置出错"
+
+#: rapid/preferencesdialog.py:645
+msgid "Error in Video Rename preferences"
+msgstr "视频重命名设置出错."
 
-#: rapid/glade3/rapid.glade.h:7
-msgid "<b>Devices</b>"
+#: rapid/preferencesdialog.py:666
+msgid "Error in Photo Download Subfolders preferences"
+msgstr "照片下载子文件夹设置出错."
+
+#: 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: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:758
+msgid "Enter a new Job Code, or select a previous one"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:8
-msgid "<b>Download Folder</b>"
-msgstr "<b>下载目录</b>"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:761
+msgid "Enter a new Job Code"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:9
-msgid "<b>Download Subfolders</b>"
-msgstr "<b>下载子目录</b>"
+#: rapid/preferencesdialog.py:766
+msgid "Job Code:"
+msgstr "任务代码："
 
-#: rapid/glade3/rapid.glade.h:10
-msgid "<b>Example</b>"
-msgstr "<b>例子</b>"
+#: rapid/preferencesdialog.py:822
+msgid "Enter a Path to Ignore"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:11
-msgid "<b>Job Codes</b>"
-msgstr "<b>任务代码</b>"
+#: rapid/preferencesdialog.py:834
+msgid "Specify a path that will never be scanned for photos or videos"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:12
-msgid "<b>Photo Rename</b>"
-msgstr "<b>照片重命名</b>"
+#: rapid/preferencesdialog.py:839
+msgid "Path:"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:13
-msgid "<b>Photo and Video Name Conflicts</b>"
-msgstr "<b>照片和视频名字冲突</b>"
+#: rapid/preferencesdialog.py:1092
+msgid "Job Code"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:14
-msgid "<b>Program Automation</b>"
-msgstr "<b>程序自动化</b>"
+#: rapid/preferencesdialog.py:1363
+msgid "Select a folder in which to backup photos"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:15
-msgid "<b>Sequence Numbers</b>"
-msgstr "<b>序列数字</b>"
+#: rapid/preferencesdialog.py:1376
+msgid "Select a folder in which to backup videos"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:16
-msgid "<i>/media/externaldrive/Photos</i>"
-msgstr "<i>/媒体/外部驱动器/照片</i>"
+#. 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:1473
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
+msgstr "<i><b>警告:</b> 没有足够的数据来完成命名, 请使用其它的重命名选项.</i>"
 
-#: rapid/glade3/rapid.glade.h:17
-msgid "<i>Example: /home/user/Pictures</i>"
-msgstr "<i>例如：/home/user/Pictures</i>"
+#: rapid/preferencesdialog.py:1524
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
+"subfolders. Please use other subfolder naming options.</i>"
+msgstr "<i><b>警告:</b> 没有足够的数据来完成自文件夹命名, 请使用其它的重命名文件夹选项.</i>"
 
-#: rapid/glade3/rapid.glade.h:18
-msgid "<i>Example:</i>"
-msgstr "<i>例如：</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:1527
+#, python-format
+msgid "<i>Example: %s</i>"
+msgstr "<i>范例: %s</i>"
 
-#: rapid/glade3/rapid.glade.h:19
-msgid "<i>New:</i>"
+#. Preferences list is now empty
+#: rapid/preferencesdialog.py:1617
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
+"They will be reset to their default values."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:20
-msgid "<i>Original:</i>"
-msgstr "<i>原始的：</i>"
+#: rapid/preferencesdialog.py:1762
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:21
-msgid "<span weight=\"bold\" size=\"x-large\">Automation</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">自动化</span>"
+#: rapid/preferencesdialog.py:1764
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:22
-msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">备份</span>\t"
+#: rapid/preferencesdialog.py:1765
+msgid "Invalid regular expression"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:23
-msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">驱动器</span>"
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1949
+msgid "externaldrive1"
+msgstr "外部驱动器1"
 
-#: rapid/glade3/rapid.glade.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">错误处理</span>"
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1951
+msgid "externaldrive2"
+msgstr "外部驱动器2"
 
-#: rapid/glade3/rapid.glade.h:25
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">任务代码</span>"
+#: rapid/prefsrapid.py:127
+msgid "New York"
+msgstr "纽约"
 
-#: rapid/glade3/rapid.glade.h:26
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">照片下载目录</span>"
+#: rapid/prefsrapid.py:128
+msgid "Manila"
+msgstr "马尼拉"
 
-#: rapid/glade3/rapid.glade.h:27
-msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">照片重命名</span>\t"
+#: rapid/prefsrapid.py:128
+msgid "Prague"
+msgstr "布拉格"
 
-#: rapid/glade3/rapid.glade.h:28
-msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">重命名选项</span>"
+#: rapid/prefsrapid.py:128
+msgid "Helsinki"
+msgstr "赫尔辛基"
 
-#: rapid/glade3/rapid.glade.h:29
-msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">视频下载目录</span>"
+#: rapid/prefsrapid.py:128
+msgid "Wellington"
+msgstr "惠灵顿"
 
-#: rapid/glade3/rapid.glade.h:30
-msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">视频重命名</span>\t"
+#: rapid/prefsrapid.py:129
+msgid "Tehran"
+msgstr "德黑兰"
 
-#: rapid/glade3/rapid.glade.h:31
-msgid "Add unique identifier"
-msgstr "添加唯一标识符"
+#: rapid/prefsrapid.py:129
+msgid "Kampala"
+msgstr "坎帕拉"
 
-#: rapid/glade3/rapid.glade.h:32
-msgid "Automatically detect Portable Storage Devices"
-msgstr "自动检测可移动存储设备"
+#: rapid/prefsrapid.py:129
+msgid "Paris"
+msgstr "巴黎"
 
-#: rapid/glade3/rapid.glade.h:33
-msgid "Automatically detect backup devices"
-msgstr "自动检测备份设备"
+#: rapid/prefsrapid.py:129
+msgid "Berlin"
+msgstr "柏林"
 
-#: rapid/glade3/rapid.glade.h:34
-msgid "Automatically detect devices"
-msgstr "自动检测设备"
+#: rapid/prefsrapid.py:129
+msgid "Sydney"
+msgstr "悉尼"
 
-#: rapid/glade3/rapid.glade.h:35
-msgid "Automation"
-msgstr "自动"
+#: rapid/prefsrapid.py:130
+msgid "Budapest"
+msgstr "布达佩斯"
 
-#: rapid/glade3/rapid.glade.h:36
-msgid "Backup"
-msgstr "备份"
+#: rapid/prefsrapid.py:130
+msgid "Rome"
+msgstr "罗马"
 
-#: rapid/glade3/rapid.glade.h:37
-msgid "Backup location:"
-msgstr "备份位置："
+#: rapid/prefsrapid.py:130
+msgid "Moscow"
+msgstr "莫斯科"
 
-#: rapid/glade3/rapid.glade.h:38
-msgid "Backup photos and videos when downloading"
-msgstr "下载时备份照片和视频"
+#: rapid/prefsrapid.py:130
+msgid "Delhi"
+msgstr "德里"
+
+#: rapid/prefsrapid.py:130
+msgid "Warsaw"
+msgstr "华沙"
+
+#: rapid/prefsrapid.py:131
+msgid "Jakarta"
+msgstr "雅加达"
+
+#: rapid/prefsrapid.py:131
+msgid "Madrid"
+msgstr "马德里"
+
+#: rapid/prefsrapid.py:131
+msgid "Stockholm"
+msgstr "斯德哥尔摩"
+
+#. components
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:329
+msgid "subfolder"
+msgstr "子目录"
+
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:327
+msgid "filename"
+msgstr "文件名"
+
+#: rapid/problemnotification.py:85
+#, python-format
+msgid "Date time value %s appears invalid."
+msgstr ""
+
+#: rapid/problemnotification.py:86
+msgid "Filename does not have an extension."
+msgstr ""
+
+#. a number component is something like the 8346 in IMG_8346.JPG
+#: rapid/problemnotification.py:88
+msgid "Filename does not have a number component."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:39
+#: rapid/problemnotification.py:89
+#, python-format
+msgid "Error generating component %s."
+msgstr ""
+
+#. a generic problem
+#: rapid/problemnotification.py:91
+#, python-format
+msgid "%(filetype)s metadata cannot be read"
+msgstr ""
+
+#: rapid/problemnotification.py:93
+#, python-format
+msgid "%(filetype)s %(area)s could not be generated"
+msgstr ""
+
+#: rapid/problemnotification.py:95 rapid/problemnotification.py:96
+#, python-format
+msgid "An error occurred when copying the %(filetype)s"
+msgstr ""
+
+#: rapid/problemnotification.py:98
+#, python-format
+msgid "The %(filetype)s did not download correctly"
+msgstr ""
+
+#: rapid/problemnotification.py:101 rapid/problemnotification.py:102
+#, python-format
+msgid "%(filetype)s already exists"
+msgstr ""
+
+#: rapid/problemnotification.py:105
+#, python-format
 msgid ""
-"Choose the download folder. Subfolders for the downloaded photos will be "
-"automatically created in this folder using the structure specified below."
-msgstr "选择下载目录。下载照片的子目录将使用下列指定结构在此目录内自动创建。"
+"%(filetype)s could not be backed up because no suitable backup locations "
+"were found."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:40
+#: rapid/problemnotification.py:110
+#, python-format
 msgid ""
-"Choose the download folder. Subfolders for the downloaded videos will be "
-"automatically created in this folder using the structure specified below."
-msgstr "选择下载目录。下载视频的子目录将使用下列指定结构在此目录内自动创建。"
+"%(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/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-10"
-msgstr "版权所有 Damon Lynch 2007-10"
+#: rapid/problemnotification.py:111
+#, python-format
+msgid "%(filetype)s was already downloaded"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:42
-msgid "Day start:"
-msgstr "开始日："
+#: rapid/problemnotification.py:115
+#, python-format
+msgid ""
+"The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+"identifier '%(identifier)s' added."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:43
-msgid "Delete photos and videos from device upon download completion"
-msgstr "下载完成后从设备删除照片和视频"
+#: rapid/problemnotification.py:116
+#, python-format
+msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:44
-msgid "Devices"
-msgstr "设备"
+#: rapid/problemnotification.py:117
+#, python-format
+msgid "There is no data with which to name the %(filetype)s."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:45
+#: rapid/problemnotification.py:119
+#, python-format
+msgid "Error: %(errorno)s %(strerror)s"
+msgstr ""
+
+#: rapid/problemnotification.py:210
 msgid ""
-"Devices are from where to download photos and videos, such as cameras, "
-"memory cards or Portable Storage Devices.\n"
-"\n"
-"You can download photos from multiple devices simultaneously, or you can "
-"specify a location on your hard drive.\n"
-"\n"
-"<i>If downloading directly from your camera works poorly or not at all, try "
-"setting it to PTP mode. If that is not possible, consider using a card "
-"reader.</i>"
+"File verification failed. The downloaded version is different from the "
+"original."
 msgstr ""
-"这里所谓“设备”就是那些您可以从上面下载图片和视频的设备，例如摄像头、内存卡或便携存储器。\n"
-"\n"
-"您可以同时从不同的设备同时下载，且可以指定一个硬盘上的位置。\n"
-"\n"
-"<i>如果直接从摄像头下载效果很差或根本不能下载，可以试试换到 PTP 模式。如果不行的话，可以考虑用一个读卡器。</i>"
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Download / Pause"
-msgstr "下载 / 暂停"
+#: rapid/problemnotification.py:213
+msgid "The metadata might be corrupt."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:51
-msgid "Download folder:"
-msgstr "下载目录："
+#: rapid/problemnotification.py:216
+msgid ""
+"The filename, extension and Exif information indicate it has already been "
+"downloaded."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:52
-msgid "Downloads today:"
-msgstr "今日下载："
+#: rapid/problemnotification.py:235
+#, python-format
+msgid " It was backed up to %(volume)s"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:53
-msgid "Error Handling"
-msgstr "错误处理"
+#: rapid/problemnotification.py:237
+msgid " It was backed up to these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:239 rapid/problemnotification.py:300
+#: rapid/problemnotification.py:312 rapid/problemnotification.py:339
+#, python-format
+msgid "%s, "
+msgstr ""
+
+#: rapid/problemnotification.py:240 rapid/problemnotification.py:301
+#: rapid/problemnotification.py:313 rapid/problemnotification.py:340
+#, python-format
+msgid "%(volumes)s and %(final_volume)s."
+msgstr ""
+
+#: rapid/problemnotification.py:252
+#, python-format
+msgid ""
+"Photos detected with the same filenames, but taken at different times: "
+"%(details)s"
+msgstr ""
+
+#: rapid/problemnotification.py:269
+#, python-format
+msgid "An error occurred when backing up on %(volume)s: %(inst)s."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:54
-msgid "Error Log"
-msgstr "错误日志"
+#: rapid/problemnotification.py:271
+#, python-format
+msgid "An error occurred when backing up on %(volume)s."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Exit program if download completes without any warnings or errors"
-msgstr "如果下载完成后没有错误和警告便直接退出"
+#: rapid/problemnotification.py:273
+msgid "Errors occurred when backing up on the following backup devices: "
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:56
-msgid "If you disable automatic detection, choose the exact backup location."
-msgstr "如果禁用了自动侦测，请选择备份的确切位置。"
+#: rapid/problemnotification.py:277 rapid/problemnotification.py:325
+#, python-format
+msgid "%(volume)s (%(inst)s), "
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:57
+#: rapid/problemnotification.py:279
+#, python-format
+msgid "%(volume)s, "
+msgstr ""
+
+#: rapid/problemnotification.py:283 rapid/problemnotification.py:327
+#, python-format
+msgid "%(volumes)s and %(volume)s (%(inst)s)."
+msgstr ""
+
+#: rapid/problemnotification.py:288
+#, python-format
+msgid "%(volumes)s and %(volume)s."
+msgstr ""
+
+#: rapid/problemnotification.py:296
+#, python-format
+msgid "Backup already exists on %(volume)s."
+msgstr ""
+
+#: rapid/problemnotification.py:298
+msgid "Backups already exist in these locations: "
+msgstr ""
+
+#: rapid/problemnotification.py:308
+#, python-format
+msgid "Backup overwritten on %(volume)s."
+msgstr ""
+
+#: rapid/problemnotification.py:310
+msgid "Backups overwritten on these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:321
+#, python-format
+msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
+msgstr ""
+
+#: rapid/problemnotification.py:323
 msgid ""
-"If you disable automatic detection, choose the exact location of the images "
-"and videos."
-msgstr "如果禁用了自动侦测，请选择照片和视频的确切位置。"
+"Errors occurred when creating directories on the following backup devices: "
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:58
+#: rapid/problemnotification.py:335
+#, python-format
 msgid ""
-"If you enable automatic detection of Portable Storage Devices, the entire "
-"device will be scanned for images. On large devices, this could take some "
-"time."
-msgstr "如果启动了可移动存储设备自动侦测，将扫描整个设备上的照片。对于大容量设备，这可能需要一些时间。"
+"File verification failed on %(volume)s. The backed up version is different "
+"from the downloaded version."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:59
-msgid "Import your photos and videos efficiently and reliably"
-msgstr "高效可靠地导入你的照片和视频"
+#: rapid/problemnotification.py:337
+msgid "File verification failed on these devices: "
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:60
-msgid "Job Codes"
+#: rapid/problemnotification.py:347
+#, python-format
+msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:61
-msgid "Location:"
-msgstr "位置："
+#: rapid/problemnotification.py:355
+#, python-format
+msgid " Furthermore, there were %(problems)s."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:62
-msgid "Overwrite"
-msgstr "覆盖"
+#: rapid/problemnotification.py:357
+#, python-format
+msgid " Furthermore, there was a %(problem)s."
+msgstr ""
+
+#: rapid/problemnotification.py:366
+#, python-format
+msgid "The %(type)s metadata is missing."
+msgstr ""
+
+#: rapid/problemnotification.py:368
+msgid "The following metadata is missing: "
+msgstr ""
+
+#: rapid/problemnotification.py:371
+#, python-format
+msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+msgstr ""
+
+#: rapid/problemnotification.py:388
+msgid "Problems in subfolder and filename generation"
+msgstr ""
+
+#: rapid/problemnotification.py:390
+msgid "Problem in subfolder and filename generation"
+msgstr ""
+
+#: rapid/problemnotification.py:393
+#, python-format
+msgid "Problems in %s generation"
+msgstr ""
+
+#: rapid/problemnotification.py:395
+#, python-format
+msgid "Problem in %s generation"
+msgstr ""
+
+#: rapid/problemnotification.py:404
+#, python-format
+msgid "%(filetype)s already exists, but it was backed up"
+msgstr ""
+
+#: rapid/problemnotification.py:406
+#, python-format
+msgid "An error occurred when copying the %(filetype)s, but it was backed up"
+msgstr ""
+
+#: rapid/problemnotification.py:428
+msgid "Multiple problems were encountered"
+msgstr ""
+
+#: rapid/problemnotification.py:430 rapid/subfolderfile.py:261
+msgid "Photos detected with the same filenames, but taken at different times"
+msgstr "检测到文件名相同，但拍摄时间不同的照片。"
+
+#: rapid/problemnotification.py:436
+msgid "there were errors backing up"
+msgstr ""
+
+#: rapid/problemnotification.py:437
+msgid "There were errors backing up"
+msgstr ""
+
+#: rapid/problemnotification.py:439
+msgid "there was an error backing up"
+msgstr ""
+
+#: rapid/problemnotification.py:440
+msgid "There was an error backing up"
+msgstr ""
+
+#. e.g.
+#: rapid/problemnotification.py:443
+#, python-format
+msgid "%(previousproblem)s, and %(backinguperror)s"
+msgstr ""
+
+#: rapid/rpdfile.py:159
+#, python-format
+msgid "%(number)s %(filetypes)s"
+msgstr ""
+
+#: rapid/rpdfile.py:169
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
+msgstr ""
+
+#: rapid/subfolderfile.py:81
+#, python-format
+msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+
+#: rapid/subfolderfile.py:325
+msgid "subfolder and filename"
+msgstr "子文件夹和文件名"
+
+#: rapid/subfolderfile.py:406
+msgid "Photo has already been downloaded"
+msgstr "照片已经下载过"
+
+#: rapid/subfolderfile.py:407
+#, python-format
+msgid "Source: %(source)s"
+msgstr "源: %(source)s"
+
+#: rapid/subfolderfile.py:485
+msgid "Failed to create download subfolder"
+msgstr ""
+
+#: rapid/subfolderfile.py:486
+#, python-format
+msgid "Path: %s"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:2
+msgid "_Check All"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "_Make a Donation..."
+msgstr "我要捐赠... (_M)"
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "_Get Help Online..."
+msgstr "获取在线帮助... (_G)"
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Preferences"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Quit"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Refresh"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "_Report a Problem..."
+msgstr "报告问题... (_R)"
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Translate this Application..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:14
+msgid "_Uncheck All"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:16
+msgid "_File"
+msgstr "文件（_F）"
+
+#: rapid/glade3/rapid.ui.h:17
+msgid "Download / Pause"
+msgstr "下载 / 暂停"
+
+#: rapid/glade3/rapid.ui.h:18
+msgid "_Select"
+msgstr "选择(_S)"
+
+#: rapid/glade3/rapid.ui.h:19
+msgid "Select All Without _Job Code"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:20
+msgid "Select All Wit_h Job Code"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:21
+msgid "_View"
+msgstr "查看(_V)"
+
+#: rapid/glade3/rapid.ui.h:22
+msgid "_Error Log"
+msgstr "错误日志 (_E)"
+
+#: rapid/glade3/rapid.ui.h:23
+msgid "_Clear Completed Downloads"
+msgstr "清除已完成的下载(_C)"
+
+#: rapid/glade3/rapid.ui.h:24
+msgid "Previous File"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:25
+msgid "Next File"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:26
+msgid "_Help"
+msgstr "帮助 (_H)"
+
+#: rapid/glade3/rapid.ui.h:27
+msgid "_Translate this Application..."
+msgstr "翻译本程序...(_T)"
+
+#: rapid/glade3/rapid.ui.h:28
+msgid "_Include in download"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:29
+msgid "_Download"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:1
+msgid "Preferences: Rapid Photo Downloader"
+msgstr "首选项：急速照片下载器"
+
+#: rapid/glade3/prefs.ui.h:2
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">照片下载目录</span>"
+
+#: rapid/glade3/prefs.ui.h:3
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr "<i>例如：/home/user/Pictures</i>"
+
+#: rapid/glade3/prefs.ui.h:4
+msgid "<b>Download Subfolders</b>"
+msgstr "<b>下载子目录</b>"
 
-#: rapid/glade3/rapid.glade.h:63
-msgid "P_review Columns"
-msgstr "预览列 (_P)"
+#: rapid/glade3/prefs.ui.h:5
+msgid "Download folder:"
+msgstr "下载目录："
 
-#: rapid/glade3/rapid.glade.h:64
+#: rapid/glade3/prefs.ui.h:6
+msgid ""
+"Choose the download folder. Subfolders for the downloaded photos will be "
+"automatically created in this folder using the structure specified below."
+msgstr "选择下载目录。下载照片的子目录将使用下列指定结构在此目录内自动创建。"
+
+#: rapid/glade3/prefs.ui.h:7
+msgid "<b>Download Folder</b>"
+msgstr "<b>下载目录</b>"
+
+#: rapid/glade3/prefs.ui.h:8
 msgid "Photo Folders"
 msgstr "照片目录"
 
-#: rapid/glade3/rapid.glade.h:65
+#: rapid/glade3/prefs.ui.h:9
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">照片重命名</span>\t"
+
+#: rapid/glade3/prefs.ui.h:10
+msgid "<b>Photo Rename</b>"
+msgstr "<b>照片重命名</b>"
+
+#: rapid/glade3/prefs.ui.h:11
+msgid " "
+msgstr " "
+
+#: rapid/glade3/prefs.ui.h:12
+msgid "<i>New:</i>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:13
+msgid "<i>Original:</i>"
+msgstr "<i>原始的：</i>"
+
+#: rapid/glade3/prefs.ui.h:14
+msgid "<b>Example</b>"
+msgstr "<b>例子</b>"
+
+#: rapid/glade3/prefs.ui.h:15
 msgid "Photo Rename"
 msgstr "照片重命名"
 
-#: rapid/glade3/rapid.glade.h:66
-msgid "Photo backup folder name:"
-msgstr "照片备份目录名称"
+#: rapid/glade3/prefs.ui.h:16
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">视频下载目录</span>"
 
-#: rapid/glade3/rapid.glade.h:67
-msgid "Preferences: Rapid Photo Downloader"
-msgstr "首选项：急速照片下载器"
+#: rapid/glade3/prefs.ui.h:17
+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 ""
 
-#: rapid/glade3/rapid.glade.h:68
-msgid "Preview _Folders"
-msgstr "预览目录 (_F)"
+#: rapid/glade3/prefs.ui.h:18
+msgid ""
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
+msgstr "选择下载目录。下载视频的子目录将使用下列指定结构在此目录内自动创建。"
 
-#: rapid/glade3/rapid.glade.h:70
+#: rapid/glade3/prefs.ui.h:19
+msgid "Video Folders"
+msgstr "视频目录"
+
+#: rapid/glade3/prefs.ui.h:20
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">视频重命名</span>\t"
+
+#: rapid/glade3/prefs.ui.h:21
+msgid "Video Rename"
+msgstr "视频重命名"
+
+#: rapid/glade3/prefs.ui.h:22
+msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">重命名选项</span>"
+
+#: rapid/glade3/prefs.ui.h:23
+msgid "<b>Sequence Numbers</b>"
+msgstr "<b>序列数字</b>"
+
+#: rapid/glade3/prefs.ui.h:24
+msgid ""
+"Specify the time in 24 hour format at which the <i>Downloads today</i> "
+"sequence number should be reset."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:25
+msgid "Day start:"
+msgstr "开始日："
+
+#: rapid/glade3/prefs.ui.h:26
+msgid "Downloads today:"
+msgstr "今日下载："
+
+#: rapid/glade3/prefs.ui.h:27
+msgid "Stored number:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:28
+msgid ":"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:29
+msgid " hh:mm"
+msgstr " hh:mm"
+
+#: rapid/glade3/prefs.ui.h:30
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "同步RAW+JPEG序列号"
+
+#: rapid/glade3/prefs.ui.h:31
+msgid "<b>Compatibility with Other Operating Systems</b>"
+msgstr "<b>兼容其它操作系统</b>"
+
+#: rapid/glade3/prefs.ui.h:32
+msgid ""
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
+msgstr "指定照片、视频或文件夹名称时应删除任何与其他操作系统不兼容的字符。"
+
+#: rapid/glade3/prefs.ui.h:33
+msgid "Strip incompatible characters"
+msgstr "去掉不兼容字符"
+
+#: rapid/glade3/prefs.ui.h:34
+msgid "Rename Options"
+msgstr "重命名选项"
+
+#: rapid/glade3/prefs.ui.h:35
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">任务代码</span>"
+
+#: rapid/glade3/prefs.ui.h:36
+msgid "<b>Job Codes</b>"
+msgstr "<b>任务代码</b>"
+
+#: rapid/glade3/prefs.ui.h:37
+msgid "_Add..."
+msgstr "添加(_A)..."
+
+#: rapid/glade3/prefs.ui.h:39
 msgid "R_emove All"
 msgstr "全部删除 (_E)"
 
-#: rapid/glade3/rapid.glade.h:72
+#: rapid/glade3/prefs.ui.h:40
+msgid "Job Codes"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:41
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">驱动器</span>"
+
+#: rapid/glade3/prefs.ui.h:42
+msgid "Devices"
+msgstr "设备"
+
+#: rapid/glade3/prefs.ui.h:43
 msgid ""
-"Rapid Photo Downloader is free software; you can redistribute it and/or "
-"modify it under the terms of the GNU General Public License as published by "
-"the Free Software Foundation; either version 2 of the License, or (at your "
-"option) any later version.\n"
+"Devices are from where to download photos and videos, such as cameras, "
+"memory cards or Portable Storage Devices.\n"
 "\n"
-"Rapid Photo Downloader is distributed in the hope that it will be useful, "
-"but WITHOUT ANY WARRANTY; without even the implied warranty of "
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
-"Public License for more details.\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with "
-"Rapid Photo Downloader; if not, write to the Free Software Foundation, Inc., "
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
 msgstr ""
-"急速照片下载器是自由软件，您可以根据自由软件基金会发布的 GPL "
-"协议的条款再发布和/或修改该软件；协议可以是第二版本或（按照您的意愿）任何一个后来的版本。\n"
-"\n"
-"急速照片下载器的发布希望对您有帮助，但是没有任何担保责任，亦无对适售性或针对特定目的而隐含的担保。详情请看 GPL 协议。\n"
+
+#: rapid/glade3/prefs.ui.h:48
+msgid "Automatically detect Portable Storage Devices"
+msgstr "自动检测可移动存储设备"
+
+#: rapid/glade3/prefs.ui.h:49
+msgid "Automatically detect devices"
+msgstr "自动检测设备"
+
+#: rapid/glade3/prefs.ui.h:50
+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"
-"您应该和急速照片下载器一同收到了一份 GPL 协议；如果没有，请写信至：Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"When this option is enabled, and a potential device is detected, you will be "
+"prompted to determine if it should be scanned or not."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:77
-msgid "Rename Options"
-msgstr "重命名选项"
+#: rapid/glade3/prefs.ui.h:53
+msgid "Location:"
+msgstr "位置："
 
-#: rapid/glade3/rapid.glade.h:78
-msgid "Se_lect None"
-msgstr "全不选 (_L)"
+#: rapid/glade3/prefs.ui.h:54
+msgid ""
+"If you disable automatic detection, choose the exact location of the photos "
+"and videos."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:79
-msgid "Select All Pho_tos"
-msgstr "选择所有照片 (_T)"
+#: rapid/glade3/prefs.ui.h:55
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:80
-msgid "Select All Vi_deos"
-msgstr "选择所有视频 (_D)"
+#: rapid/glade3/prefs.ui.h:56
+msgid "Remembered Paths"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:81
-msgid "Select All Wit_h Job Code"
+#: rapid/glade3/prefs.ui.h:57
+msgid ""
+"Remembered paths are those associated with devices that you have chosen to "
+"always scan or ignore when automatic detection of Portable Storage Devices "
+"is enabled."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:82
-msgid "Select All Without _Job Code"
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:83
-msgid "Select _All"
-msgstr "全选(_A)"
+#: rapid/glade3/prefs.ui.h:59
+msgid ""
+"Specify the ending portion of any paths you want ignored when scanning "
+"devices for photos or videos. Any path ending with the values below will not "
+"be scanned."
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:84
-msgid "Skip"
-msgstr "跳过"
+#: rapid/glade3/prefs.ui.h:61
+msgid "Re_move All"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:85
-msgid "Skip download"
-msgstr "跳过下载"
+#: rapid/glade3/prefs.ui.h:62
+msgid "Use _python-style regular expressions"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/prefs.ui.h:63
+msgid "Device Options"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:64
+msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">备份</span>\t"
+
+#: rapid/glade3/prefs.ui.h:65
+msgid "<b>Backup</b>"
+msgstr "<b>备份</b>"
+
+#: rapid/glade3/prefs.ui.h:66
 msgid ""
-"Sorry, video downloading functionality disabled. To download videos, please "
-"install the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for "
-"python."
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/prefs.ui.h:67
+msgid "Automatically detect backup devices"
+msgstr "自动检测备份设备"
+
+#: rapid/glade3/prefs.ui.h:68
+msgid ""
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
+msgstr "下载后你可以把照片或视频备份到多个位置，比如：外置硬盘。"
+
+#: rapid/glade3/prefs.ui.h:69
+msgid "Back up photos and videos when downloading"
+msgstr "下载时备份照片和视频"
+
+#: rapid/glade3/prefs.ui.h:70
 msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
@@ -1811,147 +1841,272 @@ msgstr ""
 "\n"
 "<i>注意：这还会被用来确认一个设备是否用来备份。请对每一个希望用于备份的设备创建一个有以上名称的目录。</i>"
 
-#: rapid/glade3/rapid.glade.h:90
-msgid ""
-"Specify the time in 24 hour format at which the <i>Downloads today</i> "
-"sequence number should be reset."
+#: rapid/glade3/prefs.ui.h:73
+msgid "Photo backup location:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:91
-msgid ""
-"Specify whether photo, video and folder names should have any characters "
-"removed that are not allowed by other operating systems."
-msgstr "指定照片、视频或文件夹名称时应删除任何与其他操作系统不兼容的字符。"
+#: rapid/glade3/prefs.ui.h:74
+msgid "Photo backup folder name:"
+msgstr "照片备份目录名称"
+
+#: rapid/glade3/prefs.ui.h:75
+msgid "<i>Example:</i>"
+msgstr "<i>例如：</i>"
+
+#: rapid/glade3/prefs.ui.h:76
+msgid "<i>/media/externaldrive/Photos</i>"
+msgstr "<i>/媒体/外部驱动器/照片</i>"
+
+#: rapid/glade3/prefs.ui.h:77
+msgid "Video backup folder name:"
+msgstr "视频备份目录"
+
+#: rapid/glade3/prefs.ui.h:78
+msgid "Video backup location:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:79
+msgid "Back up"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:92
+#: rapid/glade3/prefs.ui.h:80
+msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:81
+msgid "<b>Program Automation</b>"
+msgstr "<b>程序自动化</b>"
+
+#: rapid/glade3/prefs.ui.h:82
+msgid "Unmount (\"eject\") device upon download completion"
+msgstr "下载完成后卸载（弹出）设备"
+
+#: rapid/glade3/prefs.ui.h:83
 msgid "Start downloading at program startup"
 msgstr "程序启动时开始下载"
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/prefs.ui.h:84
 msgid "Start downloading upon device insertion"
 msgstr "设备插入后自动开始下载"
 
-#: rapid/glade3/rapid.glade.h:94
-msgid "Stored number:"
+#: rapid/glade3/prefs.ui.h:85
+msgid "Exit program when download completes"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:95
-msgid "Strip incompatible characters"
-msgstr "去掉不兼容字符"
+#: rapid/glade3/prefs.ui.h:86
+msgid "Exit program even if download had warnings or errors"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:96
-msgid "Synchronize RAW + JPEG sequence numbers"
-msgstr "同步RAW+JPEG序列号"
+#: rapid/glade3/prefs.ui.h:87
+msgid "Automatically rotate JPEG images"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:97
-msgid "Unmount (\"eject\") device upon download completion"
-msgstr "下载完成后卸载（弹出）设备"
+#: rapid/glade3/prefs.ui.h:89
+msgid "Verify files as they are downloaded"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:98
-msgid "Video Folders"
-msgstr "视频目录"
+#: rapid/glade3/prefs.ui.h:90
+msgid "Performance"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:99
-msgid "Video Rename"
-msgstr "视频重命名"
+#: rapid/glade3/prefs.ui.h:91
+msgid "Generate thumbnails (slower)"
+msgstr ""
 
-#: rapid/glade3/rapid.glade.h:100
-msgid "Video backup folder name:"
-msgstr "视频备份目录"
+#: rapid/glade3/prefs.ui.h:92
+msgid "Miscellaneous"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:93
+msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">错误处理</span>"
+
+#: rapid/glade3/prefs.ui.h:94
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr "<b>照片和视频名字冲突</b>"
+
+#: rapid/glade3/prefs.ui.h:95
+msgid "Add unique identifier"
+msgstr "添加唯一标识符"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/prefs.ui.h:96
+msgid "Skip download"
+msgstr "跳过下载"
+
+#: rapid/glade3/prefs.ui.h:97
 msgid ""
 "When a photo or video of the same name has already been downloaded, choose "
 "whether to skip downloading the file, or to add a unique indentifier."
 msgstr "当同名照片或视频已存在时，选择忽略下载或者增加唯一标识符。"
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
 msgstr "备份时，选择是否覆盖或忽略备份设备上的同名文件。"
 
-#: rapid/glade3/rapid.glade.h:103
-msgid ""
-"You can have your photos and videos backed up to multiple locations as they "
-"are downloaded, e.g. external hard drives."
-msgstr "下载后你可以把照片或视频备份到多个位置，比如：外置硬盘。"
+#: rapid/glade3/prefs.ui.h:99
+msgid "Overwrite"
+msgstr "覆盖"
 
-#: rapid/glade3/rapid.glade.h:104
-msgid "_Add..."
-msgstr "添加(_A)..."
+#: rapid/glade3/prefs.ui.h:100
+msgid "Skip"
+msgstr "跳过"
 
-#: rapid/glade3/rapid.glade.h:105
-msgid "_Clear Completed Downloads"
-msgstr "清除已完成的下载(_C)"
+#: rapid/glade3/prefs.ui.h:101
+msgid "Error Handling"
+msgstr "错误处理"
 
-#: rapid/glade3/rapid.glade.h:106
-msgid "_Device"
-msgstr "设备(_D)"
+#: rapid/glade3/about.ui.h:1
+msgid "Import your photos and videos efficiently and reliably"
+msgstr "高效可靠地导入你的照片和视频"
 
-#: rapid/glade3/rapid.glade.h:107
-msgid "_Error Log"
-msgstr "错误日志 (_E)"
+#~ msgid "Resetting to default values."
+#~ msgstr "重设至默认值."
 
-#: rapid/glade3/rapid.glade.h:108
-msgid "_File"
-msgstr "文件（_F）"
+#~ msgid "Resetting value to zero.\n"
+#~ msgstr "归零.\n"
 
-#: rapid/glade3/rapid.glade.h:109
-msgid "_Filename"
-msgstr "文件名(_F)"
+#~ msgid "Resetting to midnight.\n"
+#~ msgstr "重设至午夜.\n"
 
-#: rapid/glade3/rapid.glade.h:110
-msgid "_Get Help Online..."
-msgstr "获取在线帮助... (_G)"
+#~ msgid "Sorry,these preferences contain an error:\n"
+#~ msgstr "对不起, 这些自定义设置中有错误:\n"
 
-#: rapid/glade3/rapid.glade.h:111
-msgid "_Help"
-msgstr "帮助 (_H)"
+#~ msgid "'Start of day' preference value is corrupted.\n"
+#~ msgstr "'Start of day' 偏好值已经损坏\n"
 
-#: rapid/glade3/rapid.glade.h:112
-msgid "_Make a Donation..."
-msgstr "我要捐赠... (_M)"
+#~ msgid ""
+#~ "\n"
+#~ "Please check preferences, restart the program, and try again."
+#~ msgstr ""
+#~ "\n"
+#~ "请检查首选项设置，然后重启程序，再试一试。"
 
-#: rapid/glade3/rapid.glade.h:113
-msgid "_Path"
-msgstr "路径(_P)"
+#~ msgid "There is an error in the program preferences."
+#~ msgstr "程序首选项存在一个错误"
 
-#: rapid/glade3/rapid.glade.h:114
-msgid "_Preview"
-msgstr "预览(_P)"
+#~ msgid "The device can now be safely removed"
+#~ msgstr "该设备现在可以安全删除"
 
-#: rapid/glade3/rapid.glade.h:115
-msgid "_Report a Problem..."
-msgstr "报告问题... (_R)"
+#~ msgid "New day has started - resetting 'Downloads Today' sequence number"
+#~ msgstr "新的一天已开始—正在重置“今日下载”序列号"
 
-#: rapid/glade3/rapid.glade.h:116
-msgid "_Select"
-msgstr "选择(_S)"
+#~ msgid "errors"
+#~ msgstr "错误"
+
+#, python-format
+#~ msgid "Download has started from %s"
+#~ msgstr "下载已经从 %s 处开始"
 
-#: rapid/glade3/rapid.glade.h:117
-msgid "_Size"
-msgstr "大小(_S)"
+#~ msgid "This device or partition will always be used to download from"
+#~ msgstr "此设备或分区总是用来下载照片或视频"
 
-#: rapid/glade3/rapid.glade.h:118
-msgid "_Translate this Application..."
-msgstr "翻译本程序...(_T)"
+#~ msgid "This device or partition will never be used to download from"
+#~ msgstr "此设备或分区不再用于下载"
 
-#: rapid/glade3/rapid.glade.h:119
-msgid "_Type"
-msgstr "类型 (_T)"
+#, python-format
+#~ msgid "Prompting whether to use %s"
+#~ msgstr "提示是否使用 %s"
 
-#: rapid/glade3/rapid.glade.h:120
-msgid "_View"
-msgstr "查看(_V)"
+#~ msgid "Some preferences will be reset."
+#~ msgstr "某些首选项将被重置"
+
+#~ msgid ""
+#~ "Program preferences appear to be valid, but please check them to ensure "
+#~ "correct operation."
+#~ msgstr "程序首选项似乎是有效的，但请检查以确保正确的操作。"
+
+#~ msgid "Already prompting for Job Code, do not prompt again"
+#~ msgstr "已经提示过作业代码，无需再提示"
+
+#~ msgid "Starting downloads"
+#~ msgstr "开始下载"
 
-#~ msgid "Preview"
-#~ msgstr "预览"
+#~ msgid "Starting downloads that have been waiting for a Job Code"
+#~ msgstr "开始下载已经在等待作业代码的下载任务"
+
+#~ msgid "Prompting for Job Code"
+#~ msgstr "提示作业代码"
+
+#~ msgid "Sorry, some preferences are invalid and will be reset."
+#~ msgstr "抱歉，一些首选项设置无效，它们将被重置。"
+
+#~ msgid "No preferences needed to be changed."
+#~ msgstr "没有首选项需要变更。"
 
 #~ msgid ""
-#~ "Sorry, video downloading functionality disabled. To download videos, please "
-#~ "install the <i>kaa metadata</i> package for python."
-#~ msgstr "抱歉，视频下载功能已禁用。要下载视频，请安装Python下的<i>kaa元数据</i>包。"
+#~ "This version of the program uses different preferences than the old version. "
+#~ "Your preferences have been updated.\n"
+#~ "\n"
+#~ "Please check them to ensure correct operation."
+#~ msgstr "此版本程序使用与旧版本不同的首选项设置。你的首选项设置已经更新。"
+
+#~ msgid ""
+#~ "This version of the program is newer than the previously run version. "
+#~ "Checking preferences."
+#~ msgstr "此版本的程序比之前运行的版本更新。正在检查首选项设置。"
+
+#~ msgid "Using manually specified path"
+#~ msgstr "使用手动指定的路径"
+
+#, python-format
+#~ msgid "Detected %(device)s with path %(path)s"
+#~ msgstr "检测到驱动器 %(device)s 路径 %(path)s"
+
+#~ msgid "Goodbye"
+#~ msgstr "再见"
+
+#, python-format
+#~ msgid "%s is already running"
+#~ msgstr "%s 已在运行"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Automation</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">自动化</span>"
+
+#~ msgid "Backup"
+#~ msgstr "备份"
+
+#~ msgid "Backup location:"
+#~ msgstr "备份位置："
+
+#~ msgid ""
+#~ "If you enable automatic detection of Portable Storage Devices, the entire "
+#~ "device will be scanned for images. On large devices, this could take some "
+#~ "time."
+#~ msgstr "如果启动了可移动存储设备自动侦测，将扫描整个设备上的照片。对于大容量设备，这可能需要一些时间。"
+
+#~ msgid "If you disable automatic detection, choose the exact backup location."
+#~ msgstr "如果禁用了自动侦测，请选择备份的确切位置。"
+
+#~ msgid "Error Log"
+#~ msgstr "错误日志"
+
+#~ msgid ""
+#~ "Rapid Photo Downloader is free software; you can redistribute it and/or "
+#~ "modify it under the terms of the GNU General Public License as published by "
+#~ "the Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "Rapid Photo Downloader is distributed in the hope that it will be useful, "
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along with "
+#~ "Rapid Photo Downloader; if not, write to the Free Software Foundation, Inc., "
+#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+#~ msgstr ""
+#~ "急速照片下载器是自由软件，您可以根据自由软件基金会发布的 GPL "
+#~ "协议的条款再发布和/或修改该软件；协议可以是第二版本或（按照您的意愿）任何一个后来的版本。\n"
+#~ "\n"
+#~ "急速照片下载器的发布希望对您有帮助，但是没有任何担保责任，亦无对适售性或针对特定目的而隐含的担保。详情请看 GPL 协议。\n"
+#~ "\n"
+#~ "您应该和急速照片下载器一同收到了一份 GPL 协议；如果没有，请写信至：Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+
+#~ msgid "Automation"
+#~ msgstr "自动"
 
 #~ msgid ""
 #~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
@@ -2112,6 +2267,10 @@ msgstr "查看(_V)"
 #~ msgid "%(number)s of %(total)s images copied"
 #~ msgstr "%(total)s 中的 %(number)s 图像已复制"
 
+#, python-format
+#~ msgid "Download complete from %s"
+#~ msgstr "从%s开始下载完成"
+
 #~ msgid "Image overwritten"
 #~ msgstr "图像被覆盖"
 
@@ -2124,9 +2283,24 @@ msgstr "查看(_V)"
 #~ msgid "Enter a new job code, or select a previous one."
 #~ msgstr "输入一个新的任务代码或选择一个已存在的。"
 
+#~ msgid ""
+#~ "This version of the program uses different preferences than the old version. "
+#~ "Some of your previous preferences were invalid, and could not be updated. "
+#~ "They will be reset."
+#~ msgstr "此版本的程序使用跟旧版本不同的首选项。之前的一些首选项已经无效且无法更新，它们将被重置。"
+
+#~ msgid "Job Code not entered"
+#~ msgstr "任务代码还没输入"
+
 #~ msgid "Enter a new job code."
 #~ msgstr "输入一个新任务代码"
 
+#~ msgid "Failed to receive pynotify server capabilities."
+#~ msgstr "接收pynotify服务器功能失败"
+
+#~ msgid "Job Code entered"
+#~ msgstr "任务代码已输入"
+
 #~ msgid "images skipped"
 #~ msgstr "图像已忽略"
 
@@ -2235,6 +2409,9 @@ msgstr "查看(_V)"
 #~ msgid "_Photos"
 #~ msgstr "照片 (_P)"
 
+#~ msgid "      "
+#~ msgstr "      "
+
 #~ msgid ""
 #~ "The subfolder preferences entered are invalid and cannot be used.\n"
 #~ "They will be reset to their default values."
@@ -2252,12 +2429,32 @@ msgstr "查看(_V)"
 #~ msgid "0 of %s images copied"
 #~ msgstr "0/%s 图片已复制"
 
+#~ msgid "Preferences were modified."
+#~ msgstr "首选项已修改"
+
+#~ msgid "_Pause"
+#~ msgstr "暂停(_P)"
+
+#, python-format
+#~ msgid "Device %(device)s (%(path)s) ignored"
+#~ msgstr "忽略设备 %(device)s (%(path)s)"
+
+#~ msgid "Automatically start download is false"
+#~ msgstr "自动开始下载值为假"
+
+#~ msgid "Automatically start download is true"
+#~ msgstr "自动开始下载值为真"
+
 #~ msgid "list image file extensions the program recognizes and exit"
 #~ msgstr "列出程序识别的图像文件扩展名并退出"
 
 #~ msgid "<b>Image Devices</b>"
 #~ msgstr "<b>图像设备</b>"
 
+#, python-format
+#~ msgid "Preference value '%(value)s' is invalid"
+#~ msgstr "偏好值 '%(value)s' 无效"
+
 #~ msgid "<b>Image Name Conflicts</b>"
 #~ msgstr "<b>图像名冲突</b>"
 
@@ -2271,3 +2468,11 @@ msgstr "查看(_V)"
 
 #~ msgid "Unmount (\"eject\") image device upon download completion"
 #~ msgstr "下载完成后卸载（弹出）图像设备"
+
+#~ msgid "Using"
+#~ msgstr "使用"
+
+#~ msgid ""
+#~ "Specify whether image and folder names should have any characters removed "
+#~ "that are not allowed by other operating systems."
+#~ msgstr "指定是否删除图像和目录名称中其他操作系统不允许的任何字符。"